diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/base/MarkupMap.h firefox-trunk-71.0~a1~hg20190915r493291/accessible/base/MarkupMap.h
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/base/MarkupMap.h	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/base/MarkupMap.h	2019-09-15 11:33:06.000000000 +0000
@@ -395,7 +395,7 @@
     [](Element* aElement, Accessible* aContext) -> Accessible* {
       return new HTMLOutputAccessible(aElement, aContext->Document());
     },
-    roles::SECTION, Attr(live, polite))
+    roles::STATUSBAR, Attr(live, polite))
 
 MARKUPMAP(p, nullptr, roles::PARAGRAPH)
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/base/NotificationController.cpp firefox-trunk-71.0~a1~hg20190915r493291/accessible/base/NotificationController.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/base/NotificationController.cpp	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/base/NotificationController.cpp	2019-09-15 11:33:06.000000000 +0000
@@ -905,6 +905,7 @@
       if (browserChild) {
         static_cast<BrowserChild*>(browserChild.get())
             ->SendPDocAccessibleConstructor(ipcDoc, parentIPCDoc, id, 0, 0);
+        ipcDoc->SendPDocAccessiblePlatformExtConstructor();
       }
 #endif
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/base/nsAccessibilityService.h firefox-trunk-71.0~a1~hg20190915r493291/accessible/base/nsAccessibilityService.h
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/base/nsAccessibilityService.h	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/base/nsAccessibilityService.h	2019-09-15 11:33:06.000000000 +0000
@@ -246,6 +246,25 @@
   }
 
   /**
+   * Return the associated value for a given attribute if
+   * it appears in the MarkupMap. Otherwise, it returns null.
+   */
+  nsStaticAtom* MarkupAttribute(const nsIContent* aContent,
+                                nsStaticAtom* aAtom) const {
+    const mozilla::a11y::HTMLMarkupMapInfo* markupMap =
+        mHTMLMarkupMap.Get(aContent->NodeInfo()->NameAtom());
+    if (markupMap) {
+      for (size_t i = 0; i < mozilla::ArrayLength(markupMap->attrs); i++) {
+        const mozilla::a11y::MarkupAttrInfo* info = markupMap->attrs + i;
+        if (info->name == aAtom) {
+          return info->value;
+        }
+      }
+    }
+    return nullptr;
+  }
+
+  /**
    * Set the object attribute defined by markup for the given element.
    */
   void MarkupAttributes(const nsIContent* aContent,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/base/nsAccUtils.cpp firefox-trunk-71.0~a1~hg20190915r493291/accessible/base/nsAccUtils.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/base/nsAccUtils.cpp	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/base/nsAccUtils.cpp	2019-09-15 11:33:06.000000000 +0000
@@ -20,6 +20,7 @@
 #include "nsIPersistentProperties2.h"
 #include "mozilla/a11y/PDocAccessibleChild.h"
 #include "mozilla/dom/Element.h"
+#include "nsAccessibilityService.h"
 
 using namespace mozilla;
 using namespace mozilla::a11y;
@@ -138,7 +139,11 @@
                                        live);
       } else if (role) {
         GetLiveAttrValue(role->liveAttRule, live);
+      } else if (nsStaticAtom* value = GetAccService()->MarkupAttribute(
+                     ancestor, nsGkAtoms::live)) {
+        value->ToString(live);
       }
+
       if (!live.IsEmpty()) {
         SetAccAttr(aAttributes, nsGkAtoms::containerLive, live);
         if (role) {
@@ -488,6 +493,9 @@
                                        docLive);
       } else if (role) {
         GetLiveAttrValue(role->liveAttRule, docLive);
+      } else if (nsStaticAtom* value = GetAccService()->MarkupAttribute(
+                     ancestor, nsGkAtoms::live)) {
+        value->ToString(docLive);
       }
       if (!docLive.IsEmpty()) {
         live = docLive;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/generic/DocAccessible.cpp firefox-trunk-71.0~a1~hg20190915r493291/accessible/generic/DocAccessible.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/generic/DocAccessible.cpp	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/generic/DocAccessible.cpp	2019-09-15 11:33:06.000000000 +0000
@@ -1543,6 +1543,9 @@
 #endif
           browserChild->SendPDocAccessibleConstructor(ipcDoc, nullptr, 0,
                                                       childID, holder);
+#if !defined(XP_WIN)
+          ipcDoc->SendPDocAccessiblePlatformExtConstructor();
+#endif
         }
 
         if (IsRoot()) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/generic/HyperTextAccessible.h firefox-trunk-71.0~a1~hg20190915r493291/accessible/generic/HyperTextAccessible.h
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/generic/HyperTextAccessible.h	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/generic/HyperTextAccessible.h	2019-09-15 11:33:06.000000000 +0000
@@ -401,8 +401,9 @@
   //////////////////////////////////////////////////////////////////////////////
   // EditableTextAccessible
 
-  void ReplaceText(const nsAString& aText);
-  void InsertText(const nsAString& aText, int32_t aPosition);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY void ReplaceText(const nsAString& aText);
+  MOZ_CAN_RUN_SCRIPT_BOUNDARY void InsertText(const nsAString& aText,
+                                              int32_t aPosition);
   void CopyText(int32_t aStartPos, int32_t aEndPos);
   MOZ_CAN_RUN_SCRIPT_BOUNDARY void CutText(int32_t aStartPos, int32_t aEndPos);
   MOZ_CAN_RUN_SCRIPT_BOUNDARY void DeleteText(int32_t aStartPos,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/DocAccessibleParent.cpp firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/DocAccessibleParent.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/DocAccessibleParent.cpp	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/DocAccessibleParent.cpp	2019-09-15 11:33:06.000000000 +0000
@@ -20,6 +20,8 @@
 #  include "mozilla/mscom/Ptr.h"
 #  include "nsWinUtils.h"
 #  include "RootAccessible.h"
+#else
+#  include "mozilla/a11y/DocAccessiblePlatformExtParent.h"
 #endif
 
 namespace mozilla {
@@ -916,6 +918,23 @@
 #  endif  // defined(XP_WIN)
   return IPC_OK();
 }
+
+bool DocAccessibleParent::DeallocPDocAccessiblePlatformExtParent(
+    PDocAccessiblePlatformExtParent* aActor) {
+  delete aActor;
+  return true;
+}
+
+PDocAccessiblePlatformExtParent*
+DocAccessibleParent::AllocPDocAccessiblePlatformExtParent() {
+  return new DocAccessiblePlatformExtParent();
+}
+
+DocAccessiblePlatformExtParent* DocAccessibleParent::GetPlatformExtension() {
+  return static_cast<DocAccessiblePlatformExtParent*>(
+      SingleManagedOrNull(ManagedPDocAccessiblePlatformExtParent()));
+}
+
 #endif  // !defined(XP_WIN)
 
 Tuple<DocAccessibleParent*, uint64_t> DocAccessibleParent::GetRemoteEmbedder() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/DocAccessibleParent.h firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/DocAccessibleParent.h
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/DocAccessibleParent.h	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/DocAccessibleParent.h	2019-09-15 11:33:06.000000000 +0000
@@ -20,6 +20,10 @@
 
 class xpcAccessibleGeneric;
 
+#if !defined(XP_WIN)
+class DocAccessiblePlatformExtParent;
+#endif
+
 /*
  * These objects live in the main process and comunicate with and represent
  * an accessible document in a content process.
@@ -241,6 +245,14 @@
 #if !defined(XP_WIN)
   virtual mozilla::ipc::IPCResult RecvBatch(
       const uint64_t& aBatchType, nsTArray<BatchData>&& aData) override;
+
+  virtual bool DeallocPDocAccessiblePlatformExtParent(
+      PDocAccessiblePlatformExtParent* aActor) override;
+
+  virtual PDocAccessiblePlatformExtParent*
+  AllocPDocAccessiblePlatformExtParent() override;
+
+  DocAccessiblePlatformExtParent* GetPlatformExtension();
 #endif
 
   /**
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/android/DocAccessiblePlatformExtChild.cpp firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/android/DocAccessiblePlatformExtChild.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/android/DocAccessiblePlatformExtChild.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/android/DocAccessiblePlatformExtChild.cpp	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,81 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "DocAccessiblePlatformExtChild.h"
+
+#include "DocAccessibleChild.h"
+#include "AccessibleWrap.h"
+
+namespace mozilla {
+namespace a11y {
+
+mozilla::ipc::IPCResult DocAccessiblePlatformExtChild::RecvPivot(
+    uint64_t aID, int32_t aGranularity, bool aForward, bool aInclusive) {
+  if (auto acc = IdToAccessibleWrap(aID)) {
+    // XXX: Forward to appropriate wrapper method.
+  }
+
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult DocAccessiblePlatformExtChild::RecvNavigateText(
+    int32_t aID, int32_t aGranularity, int32_t aStartOffset, int32_t aEndOffset,
+    bool aForward, bool aSelect) {
+  if (auto acc = IdToAccessibleWrap(aID)) {
+    // XXX: Forward to appropriate wrapper method.
+  }
+
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult DocAccessiblePlatformExtChild::RecvSetSelection(
+    uint64_t aID, int32_t aStart, int32_t aEnd) {
+  if (auto acc = IdToAccessibleWrap(aID)) {
+    // XXX: Forward to appropriate wrapper method.
+  }
+
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult DocAccessiblePlatformExtChild::RecvCut(uint64_t aID) {
+  if (auto acc = IdToAccessibleWrap(aID)) {
+    // XXX: Forward to appropriate wrapper method.
+  }
+
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult DocAccessiblePlatformExtChild::RecvCopy(uint64_t aID) {
+  if (auto acc = IdToAccessibleWrap(aID)) {
+    // XXX: Forward to appropriate wrapper method.
+  }
+
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult DocAccessiblePlatformExtChild::RecvPaste(uint64_t aID) {
+  if (auto acc = IdToAccessibleWrap(aID)) {
+    // XXX: Forward to appropriate wrapper method.
+  }
+
+  return IPC_OK();
+}
+
+mozilla::ipc::IPCResult DocAccessiblePlatformExtChild::RecvExploreByTouch(
+    uint64_t aID, float aX, float aY) {
+  // XXX: Forward to appropriate wrapper method.
+
+  return IPC_OK();
+}
+
+AccessibleWrap* DocAccessiblePlatformExtChild::IdToAccessibleWrap(
+    const uint64_t& aID) const {
+  return static_cast<AccessibleWrap*>(
+      static_cast<DocAccessibleChild*>(Manager())->IdToAccessible(aID));
+}
+
+}  // namespace a11y
+}  // namespace mozilla
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/android/DocAccessiblePlatformExtChild.h firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/android/DocAccessiblePlatformExtChild.h
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/android/DocAccessiblePlatformExtChild.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/android/DocAccessiblePlatformExtChild.h	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,44 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_a11y_DocAccessiblePlatformExtChild_h
+#define mozilla_a11y_DocAccessiblePlatformExtChild_h
+
+#include "mozilla/a11y/PDocAccessiblePlatformExtChild.h"
+
+namespace mozilla {
+namespace a11y {
+
+class AccessibleWrap;
+class DocAccessibleChild;
+
+class DocAccessiblePlatformExtChild : public PDocAccessiblePlatformExtChild {
+ public:
+  mozilla::ipc::IPCResult RecvPivot(uint64_t aID, int32_t aGranularity,
+                                    bool aForward, bool aInclusive);
+
+  mozilla::ipc::IPCResult RecvNavigateText(int32_t aID, int32_t aGranularity,
+                                           int32_t aStartOffset,
+                                           int32_t aEndOffset, bool aForward,
+                                           bool aSelect);
+
+  mozilla::ipc::IPCResult RecvSetSelection(uint64_t aID, int32_t aStart,
+                                           int32_t aEnd);
+
+  mozilla::ipc::IPCResult RecvCut(uint64_t aID);
+
+  mozilla::ipc::IPCResult RecvCopy(uint64_t aID);
+
+  mozilla::ipc::IPCResult RecvPaste(uint64_t aID);
+
+  mozilla::ipc::IPCResult RecvExploreByTouch(uint64_t aID, float aX, float aY);
+
+ private:
+  AccessibleWrap* IdToAccessibleWrap(const uint64_t& aID) const;
+};
+}  // namespace a11y
+}  // namespace mozilla
+
+#endif
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/android/DocAccessiblePlatformExtParent.h firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/android/DocAccessiblePlatformExtParent.h
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/android/DocAccessiblePlatformExtParent.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/android/DocAccessiblePlatformExtParent.h	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,18 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_a11y_DocAccessiblePlatformExtParent_h
+#define mozilla_a11y_DocAccessiblePlatformExtParent_h
+
+#include "mozilla/a11y/PDocAccessiblePlatformExtParent.h"
+
+namespace mozilla {
+namespace a11y {
+class DocAccessiblePlatformExtParent : public PDocAccessiblePlatformExtParent {
+};
+}  // namespace a11y
+}  // namespace mozilla
+
+#endif
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/android/moz.build firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/android/moz.build
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/android/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/android/moz.build	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,29 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+# With --disable-accessibility, we need to compile PDocAccessiblePlatformExt.ipdl, but
+# not the C++.
+
+IPDL_SOURCES += ['PDocAccessiblePlatformExt.ipdl']
+
+if CONFIG['ACCESSIBILITY']:
+    EXPORTS.mozilla.a11y += [
+        'DocAccessiblePlatformExtChild.h',
+        'DocAccessiblePlatformExtParent.h',
+    ]
+
+    SOURCES += [
+        'DocAccessiblePlatformExtChild.cpp',
+    ]
+
+    LOCAL_INCLUDES += [
+        '/accessible/android',
+        '/accessible/ipc/other',
+    ]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/android/PDocAccessiblePlatformExt.ipdl firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/android/PDocAccessiblePlatformExt.ipdl
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/android/PDocAccessiblePlatformExt.ipdl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/android/PDocAccessiblePlatformExt.ipdl	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,33 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+include protocol PDocAccessible;
+
+namespace mozilla {
+namespace a11y {
+
+protocol PDocAccessiblePlatformExt {
+  manager PDocAccessible;
+
+child:
+  async __delete__();
+
+  async Pivot(uint64_t aID, int32_t aGranularity, bool aForward, bool aInclusive);
+
+  async NavigateText(int32_t aID, int32_t aGranularity, int32_t aStartOffset, int32_t aEndOffset, bool aForward, bool aSelect);
+
+  async SetSelection(int32_t aID, int32_t aStart, int32_t aEnd);
+
+  async Cut(int32_t aID);
+
+  async Copy(int32_t aID);
+
+  async Paste(int32_t aID);
+
+  async ExploreByTouch(int32_t aID, float aX, float aY);
+  };
+}
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/moz.build firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/moz.build
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/moz.build	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,10 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':
+    DIRS += ['android']
+else:
+    DIRS += ['other']
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/other/DocAccessiblePlatformExtChild.h firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/other/DocAccessiblePlatformExtChild.h
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/other/DocAccessiblePlatformExtChild.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/other/DocAccessiblePlatformExtChild.h	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,20 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_a11y_DocAccessiblePlatformExtChild_h
+#define mozilla_a11y_DocAccessiblePlatformExtChild_h
+
+#include "mozilla/a11y/PDocAccessiblePlatformExtChild.h"
+
+namespace mozilla {
+namespace a11y {
+
+class DocAccessibleChild;
+
+class DocAccessiblePlatformExtChild : public PDocAccessiblePlatformExtChild {};
+}  // namespace a11y
+}  // namespace mozilla
+
+#endif
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/other/DocAccessiblePlatformExtParent.h firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/other/DocAccessiblePlatformExtParent.h
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/other/DocAccessiblePlatformExtParent.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/other/DocAccessiblePlatformExtParent.h	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,18 @@
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_a11y_DocAccessiblePlatformExtParent_h
+#define mozilla_a11y_DocAccessiblePlatformExtParent_h
+
+#include "mozilla/a11y/PDocAccessiblePlatformExtParent.h"
+
+namespace mozilla {
+namespace a11y {
+class DocAccessiblePlatformExtParent : public PDocAccessiblePlatformExtParent {
+};
+}  // namespace a11y
+}  // namespace mozilla
+
+#endif
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/other/moz.build firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/other/moz.build
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/other/moz.build	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/other/moz.build	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,20 @@
+# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
+# vim: set filetype=python:
+# 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/.
+
+# With --disable-accessibility, we need to compile PDocAccessiblePlatformExt.ipdl, but
+# not the C++.
+
+IPDL_SOURCES += ['PDocAccessiblePlatformExt.ipdl']
+
+if CONFIG['ACCESSIBILITY']:
+    EXPORTS.mozilla.a11y += [
+        'DocAccessiblePlatformExtChild.h',
+        'DocAccessiblePlatformExtParent.h',
+    ]
+
+include('/ipc/chromium/chromium-config.mozbuild')
+
+FINAL_LIBRARY = 'xul'
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/other/PDocAccessiblePlatformExt.ipdl firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/other/PDocAccessiblePlatformExt.ipdl
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/extension/other/PDocAccessiblePlatformExt.ipdl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/extension/other/PDocAccessiblePlatformExt.ipdl	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,19 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+include protocol PDocAccessible;
+
+namespace mozilla {
+namespace a11y {
+
+protocol PDocAccessiblePlatformExt {
+  manager PDocAccessible;
+
+child:
+  async __delete__();
+};
+
+}}
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/moz.build firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/moz.build
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/moz.build	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/moz.build	2019-09-15 11:33:06.000000000 +0000
@@ -12,7 +12,7 @@
         '/accessible/windows/msaa',
     ]
 else:
-    DIRS += ['other']
+    DIRS += ['other', 'extension']
     LOCAL_INCLUDES += [
         '/accessible/ipc/other',
     ]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/other/DocAccessibleChild.cpp firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/other/DocAccessibleChild.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/other/DocAccessibleChild.cpp	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/other/DocAccessibleChild.cpp	2019-09-15 11:33:06.000000000 +0000
@@ -22,6 +22,7 @@
 #  include "AccessibleWrap.h"
 #endif
 #include "mozilla/PresShell.h"
+#include "mozilla/a11y/DocAccessiblePlatformExtChild.h"
 
 namespace mozilla {
 namespace a11y {
@@ -1680,5 +1681,16 @@
   return IPC_OK();
 }
 
+bool DocAccessibleChild::DeallocPDocAccessiblePlatformExtChild(
+    PDocAccessiblePlatformExtChild* aActor) {
+  delete aActor;
+  return true;
+}
+
+PDocAccessiblePlatformExtChild*
+DocAccessibleChild::AllocPDocAccessiblePlatformExtChild() {
+  return new DocAccessiblePlatformExtChild();
+}
+
 }  // namespace a11y
 }  // namespace mozilla
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/other/DocAccessibleChild.h firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/other/DocAccessibleChild.h
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/other/DocAccessibleChild.h	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/other/DocAccessibleChild.h	2019-09-15 11:33:06.000000000 +0000
@@ -13,6 +13,7 @@
 namespace a11y {
 
 class Accessible;
+class DocAccessiblePlatformExtChild;
 class HyperTextAccessible;
 class TextLeafAccessible;
 class ImageAccessible;
@@ -24,6 +25,8 @@
  * and their lifetime is the same as the document they represent.
  */
 class DocAccessibleChild : public DocAccessibleChildBase {
+  friend DocAccessiblePlatformExtChild;
+
  public:
   DocAccessibleChild(DocAccessible* aDoc, IProtocol* aManager)
       : DocAccessibleChildBase(aDoc) {
@@ -471,6 +474,12 @@
   virtual mozilla::ipc::IPCResult RecvDOMNodeID(const uint64_t& aID,
                                                 nsString* aDOMNodeID) override;
 
+  virtual bool DeallocPDocAccessiblePlatformExtChild(
+      PDocAccessiblePlatformExtChild* aActor) override;
+
+  virtual PDocAccessiblePlatformExtChild* AllocPDocAccessiblePlatformExtChild()
+      override;
+
  private:
   Accessible* IdToAccessible(const uint64_t& aID) const;
   Accessible* IdToAccessibleLink(const uint64_t& aID) const;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/other/PDocAccessible.ipdl firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/other/PDocAccessible.ipdl
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/ipc/other/PDocAccessible.ipdl	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/ipc/other/PDocAccessible.ipdl	2019-09-15 11:33:06.000000000 +0000
@@ -6,6 +6,7 @@
 
 include protocol PFileDescriptorSet;
 include protocol PBrowser;
+include protocol PDocAccessiblePlatformExt;
 
 include "mozilla/GfxMessageUtils.h";
 
@@ -71,8 +72,10 @@
 nested(upto inside_sync) sync protocol PDocAccessible
 {
   manager PBrowser;
+  manages PDocAccessiblePlatformExt;
 
 parent:
+  async PDocAccessiblePlatformExt();
   async Shutdown();
 
   /*
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/tests/mochitest/attributes/test_obj.html firefox-trunk-71.0~a1~hg20190915r493291/accessible/tests/mochitest/attributes/test_obj.html
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/tests/mochitest/attributes/test_obj.html	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/tests/mochitest/attributes/test_obj.html	2019-09-15 11:33:06.000000000 +0000
@@ -88,6 +88,9 @@
       testAttrs("statusChild", {"container-live": "polite"}, true);
       testAttrs("timerChild", {"container-live": "off"}, true);
       testAbsentAttrs("tablistChild", {"container-live": "polite"});
+      testAttrs("containerLiveOutput", {"container-live": "polite"}, true);
+      testAttrs("containerLiveOutput1", {"container-live": "polite"}, true);
+      testAttrs("containerLiveOutput2", {"container-live": "polite"}, true);
 
       // container-live-role object attribute
       testAttrs("log", {"container-live-role": "log"}, true);
@@ -166,6 +169,9 @@
   <pre id="test">
   </pre>
 
+  <!-- container live -->
+  <output id="containerLiveOutput"><div id="containerLiveOutput1"><div id="containerLiveOutput2">Test</div></div></output>
+
   <!-- aria -->
   <div id="atomic" aria-atomic="true">live region</div>
   <div id="atomic_false" aria-atomic="false">live region</div>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/tests/mochitest/elm/test_HTMLSpec.html firefox-trunk-71.0~a1~hg20190915r493291/accessible/tests/mochitest/elm/test_HTMLSpec.html
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/tests/mochitest/elm/test_HTMLSpec.html	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/tests/mochitest/elm/test_HTMLSpec.html	2019-09-15 11:33:06.000000000 +0000
@@ -192,7 +192,7 @@
         role: ROLE_PARAGRAPH,
         children: [
           { role: ROLE_WHITESPACE },
-          { role: ROLE_WHITESPACE } 
+          { role: ROLE_WHITESPACE }
         ]
       };
       testElm("br_container", obj);
@@ -1143,7 +1143,7 @@
       // HTML:output
 
       obj = {
-        role: ROLE_SECTION,
+        role: ROLE_STATUSBAR,
         attributes: { "live": "polite" },
         todo_relations: {
           RELATION_CONTROLLED_BY: "output_input",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/accessible/tests/mochitest/tree/test_formctrl.html firefox-trunk-71.0~a1~hg20190915r493291/accessible/tests/mochitest/tree/test_formctrl.html
--- firefox-trunk-71.0~a1~hg20190913r492975/accessible/tests/mochitest/tree/test_formctrl.html	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/accessible/tests/mochitest/tree/test_formctrl.html	2019-09-15 11:33:06.000000000 +0000
@@ -72,7 +72,7 @@
 
       // output
       accTree = {
-        role: ROLE_SECTION,
+        role: ROLE_STATUSBAR,
         children: [
           {
             role: ROLE_TEXT_LEAF,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/actors/PageStyleChild.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/actors/PageStyleChild.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/actors/PageStyleChild.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/actors/PageStyleChild.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -104,7 +104,7 @@
       }
 
       // Skip any stylesheets that don't match the screen media type.
-      if (currentStyleSheet.media.length > 0) {
+      if (currentStyleSheet.media.length) {
         let mediaQueryList = currentStyleSheet.media.mediaText;
         if (!content.matchMedia(mediaQueryList).matches) {
           continue;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/actors/PluginChild.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/actors/PluginChild.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/actors/PluginChild.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/actors/PluginChild.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -335,7 +335,7 @@
           return;
         }
         evt.preventDefault();
-        if (callbackArgs.length == 0) {
+        if (!callbackArgs.length) {
           callbackArgs = [evt];
         }
         self[callbackName].apply(self, callbackArgs);
@@ -351,7 +351,7 @@
         }
         if (evt.keyCode == evt.DOM_VK_RETURN) {
           evt.preventDefault();
-          if (callbackArgs.length == 0) {
+          if (!callbackArgs.length) {
             callbackArgs = [evt];
           }
           evt.preventDefault();
@@ -803,7 +803,7 @@
           Ci.nsIObjectLoadingContent.TYPE_PLUGIN
       );
 
-      if (plugins.length == 0) {
+      if (!plugins.length) {
         this.removeNotification();
         return;
       }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/app/profile/firefox.js firefox-trunk-71.0~a1~hg20190915r493291/browser/app/profile/firefox.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/app/profile/firefox.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/app/profile/firefox.js	2019-09-15 11:33:06.000000000 +0000
@@ -2234,8 +2234,8 @@
   pref("devtools.webconsole.sidebarToggle", false);
 #endif
 
-// Enable editor mode in the console in Nightly builds.
-#if defined(NIGHTLY_BUILD)
+// Enable editor mode in the console in Nightly and DevEdition builds.
+#if defined(NIGHTLY_BUILD) || defined(MOZ_DEV_EDITION)
   pref("devtools.webconsole.features.editor", true);
 #else
   pref("devtools.webconsole.features.editor", false);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/aboutNetError.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/aboutNetError.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/aboutNetError.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/aboutNetError.js	2019-09-15 11:33:06.000000000 +0000
@@ -863,7 +863,7 @@
 
   if (failedCertInfo.isDomainMismatch) {
     let subjectAltNames = failedCertInfo.subjectAltNames.split(",");
-    subjectAltNames = subjectAltNames.filter(name => name.length > 0);
+    subjectAltNames = subjectAltNames.filter(name => !!name.length);
     let numSubjectAltNames = subjectAltNames.length;
 
     if (numSubjectAltNames != 0) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-addons.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-addons.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-addons.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-addons.js	2019-09-15 11:33:06.000000000 +0000
@@ -301,7 +301,7 @@
       i => i.addon.signedState <= AddonManager.SIGNEDSTATE_MISSING
     );
     let someUnsigned =
-      unsigned.length > 0 && unsigned.length < installInfo.installs.length;
+      !!unsigned.length && unsigned.length < installInfo.installs.length;
 
     options.eventCallback = aEvent => {
       switch (aEvent) {
@@ -361,7 +361,7 @@
       );
       notification.setAttribute("warning", "true");
       options.learnMoreURL += "unsigned-addons";
-    } else if (unsigned.length == 0) {
+    } else if (!unsigned.length) {
       // All add-ons are verified or don't need to be verified
       messageString = gNavigatorBundle.getString("addonConfirmInstall.message");
       notification.removeAttribute("warning");
@@ -450,7 +450,7 @@
 
     PopupNotifications.remove(notifications, true);
 
-    return notifications.length > 0;
+    return !!notifications.length;
   },
 
   logWarningFullScreenInstallBlocked() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-fullScreenAndPointerLock.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-fullScreenAndPointerLock.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-fullScreenAndPointerLock.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-fullScreenAndPointerLock.js	2019-09-15 11:33:06.000000000 +0000
@@ -436,7 +436,7 @@
       window.fullScreen &&
       PopupNotifications.getNotification(
         this._permissionNotificationIDs
-      ).filter(n => !n.dismissed).length > 0
+      ).filter(n => !n.dismissed).length
     ) {
       this.exitDomFullScreen();
       this._logWarningPermissionPromptFS("fullScreenCanceled");
@@ -513,7 +513,7 @@
         this._permissionNotificationIDs
       ).filter(n => !n.dismissed);
       PopupNotifications.remove(notifications, true);
-      if (notifications.length > 0) {
+      if (notifications.length) {
         this._logWarningPermissionPromptFS("promptCanceled");
       }
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser.js	2019-09-15 11:33:06.000000000 +0000
@@ -3882,7 +3882,7 @@
     }
   }
 
-  if (unchangedRemoteness.length == 0) {
+  if (!unchangedRemoteness.length) {
     return;
   }
 
@@ -4687,7 +4687,7 @@
     }
 
     var engines = gBrowser.selectedBrowser.engines;
-    if (engines && engines.length > 0) {
+    if (engines && engines.length) {
       searchBar.setAttribute("addengines", "true");
     } else {
       searchBar.removeAttribute("addengines");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-pageActions.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-pageActions.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-pageActions.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-pageActions.js	2019-09-15 11:33:06.000000000 +0000
@@ -1309,7 +1309,7 @@
 
     // We cache the providers + the UI if the user selects the share
     // panel multiple times while the panel is open.
-    if (this._cached && bodyNode.children.length > 0) {
+    if (this._cached && bodyNode.children.length) {
       return;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-siteProtections.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-siteProtections.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-siteProtections.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-siteProtections.js	2019-09-15 11:33:06.000000000 +0000
@@ -416,7 +416,7 @@
     // not detect trackers on the page using the basic list, we currently
     // still show the panel. To reduce the confusion, tell the user that we have
     // not detected any tracker.
-    if (fragment.childNodes.length == 0) {
+    if (!fragment.childNodes.length) {
       let emptyBox = document.createXULElement("vbox");
       let emptyImage = document.createXULElement("image");
       emptyImage.classList.add("protections-popup-trackersView-empty-image");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-sync.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-sync.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-sync.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-sync.js	2019-09-15 11:33:06.000000000 +0000
@@ -795,7 +795,7 @@
 
     const state = UIState.get();
     if (state.status == UIState.STATUS_SIGNED_IN) {
-      if (this.sendTabTargets.length > 0) {
+      if (this.sendTabTargets.length) {
         this._appendSendTabDeviceList(
           fragment,
           createDeviceNodeFn,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-tabsintitlebar.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-tabsintitlebar.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser-tabsintitlebar.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser-tabsintitlebar.js	2019-09-15 11:33:06.000000000 +0000
@@ -74,7 +74,7 @@
       let allowed =
         this.systemSupported &&
         !window.fullScreen &&
-        Object.keys(this._disallowed).length == 0;
+        !Object.keys(this._disallowed).length;
       if (allowed) {
         document.documentElement.setAttribute("tabsintitlebar", "true");
         if (AppConstants.platform == "macosx") {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser.xhtml firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser.xhtml
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/browser.xhtml	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/browser.xhtml	2019-09-15 11:33:06.000000000 +0000
@@ -886,7 +886,7 @@
               </box>
               <box id="identity-box" role="button"
                    align="center"
-                   data-l10n-id="browser-urlbar-identity-button"
+                   data-l10n-id="urlbar-identity-button"
                    pageproxystate="invalid"
                    onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
                    onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
@@ -930,48 +930,47 @@
                      onmouseout="document.getElementById('identity-box').classList.remove('no-hover');"
                      align="center">
                   <image id="default-notification-icon" class="notification-anchor-icon" role="button"
-                         tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-default-notification-anchor"/>
                   <image id="geo-notification-icon" class="notification-anchor-icon geo-icon" role="button"
-                         tooltiptext="&urlbar.geolocationNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-geolocation-notification-anchor"/>
                   <image id="autoplay-media-notification-icon" class="notification-anchor-icon autoplay-media-icon" role="button"
-                         tooltiptext="&urlbar.autoplayNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-autoplay-notification-anchor"/>
                   <image id="addons-notification-icon" class="notification-anchor-icon install-icon" role="button"
-                         tooltiptext="&urlbar.addonsNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-addons-notification-anchor"/>
                   <image id="canvas-notification-icon" class="notification-anchor-icon" role="button"
-                         tooltiptext="&urlbar.canvasNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-canvas-notification-anchor"/>
                   <image id="indexedDB-notification-icon" class="notification-anchor-icon indexedDB-icon" role="button"
-                         tooltiptext="&urlbar.indexedDBNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-indexed-db-notification-anchor"/>
                   <image id="password-notification-icon" class="notification-anchor-icon login-icon" role="button"
-                         tooltiptext="&urlbar.passwordNotificationAnchor.tooltip;"/>
-                  <stack id="plugins-notification-icon" class="notification-anchor-icon" role="button" align="center"
-                         tooltiptext="&urlbar.pluginsNotificationAnchor.tooltip;">
+                         data-l10n-id="urlbar-password-notification-anchor"/>
+                  <stack id="plugins-notification-icon" class="notification-anchor-icon" role="button" align="center" data-l10n-id="urlbar-plugins-notification-anchor">
                     <image class="plugin-icon" />
                     <image id="plugin-icon-badge" />
                   </stack>
                   <image id="web-notifications-notification-icon" class="notification-anchor-icon desktop-notification-icon" role="button"
-                         tooltiptext="&urlbar.webNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-web-notification-anchor"/>
                   <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon camera-icon" role="button"
-                         tooltiptext="&urlbar.webRTCShareDevicesNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-web-rtc-share-devices-notification-anchor"/>
                   <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon microphone-icon" role="button"
-                         tooltiptext="&urlbar.webRTCShareMicrophoneNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-web-rtc-share-microphone-notification-anchor"/>
                   <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon screen-icon" role="button"
-                         tooltiptext="&urlbar.webRTCShareScreenNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-web-rtc-share-screen-notification-anchor"/>
                   <image id="servicesInstall-notification-icon" class="notification-anchor-icon service-icon" role="button"
-                         tooltiptext="&urlbar.servicesNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-services-notification-anchor"/>
                   <image id="translate-notification-icon" class="notification-anchor-icon translation-icon" role="button"
-                         tooltiptext="&urlbar.translateNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-translate-notification-anchor"/>
                   <image id="translated-notification-icon" class="notification-anchor-icon translation-icon in-use" role="button"
-                         tooltiptext="&urlbar.translatedNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-translated-notification-anchor"/>
                   <image id="eme-notification-icon" class="notification-anchor-icon drm-icon" role="button"
-                         tooltiptext="&urlbar.emeNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-eme-notification-anchor"/>
                   <image id="persistent-storage-notification-icon" class="notification-anchor-icon persistent-storage-icon" role="button"
-                         tooltiptext="&urlbar.persistentStorageNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-persistent-storage-notification-anchor"/>
                   <image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button"
-                         tooltiptext="&urlbar.midiNotificationAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-midi-notification-anchor"/>
                   <image id="webauthn-notification-icon" class="notification-anchor-icon" role="button"
-                         tooltiptext="&urlbar.webAuthnAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-web-authn-anchor"/>
                   <image id="storage-access-notification-icon" class="notification-anchor-icon storage-access-icon" role="button"
-                         tooltiptext="&urlbar.storageAccessAnchor.tooltip;"/>
+                         data-l10n-id="urlbar-storage-access-anchor"/>
                 </box>
                 <image id="remote-control-icon"
                        tooltiptext="&urlbar.remoteControlNotificationAnchor.tooltip;"/>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/nsContextMenu.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/nsContextMenu.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/nsContextMenu.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/nsContextMenu.js	2019-09-15 11:33:06.000000000 +0000
@@ -325,7 +325,7 @@
     const { gBrowser } = this.browser.ownerGlobal;
 
     this.textSelected = this.selectionInfo.text;
-    this.isTextSelected = this.textSelected.length != 0;
+    this.isTextSelected = !!this.textSelected.length;
     this.webExtBrowserType = this.browser.getAttribute(
       "webextension-view-type"
     );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/pageinfo/security.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/pageinfo/security.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/pageinfo/security.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/pageinfo/security.js	2019-09-15 11:33:06.000000000 +0000
@@ -183,7 +183,7 @@
     let usage = this.siteData.reduce((acc, site) => acc + site.usage, 0);
     if (usage > 0) {
       let size = DownloadUtils.convertByteUnits(usage);
-      let hasCookies = this.siteData.some(site => site.cookies.length > 0);
+      let hasCookies = this.siteData.some(site => !!site.cookies.length);
       if (hasCookies) {
         document.l10n.setAttributes(
           siteDataLabel,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/tabbrowser.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/tabbrowser.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/tabbrowser.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/tabbrowser.js	2019-09-15 11:33:06.000000000 +0000
@@ -3320,11 +3320,7 @@
         // Closing the tab and replacing it with a blank one is notably slower
         // than closing the window right away. If the caller opts in, take
         // the fast path.
-        if (
-          closeWindow &&
-          closeWindowFastpath &&
-          this._removingTabs.length == 0
-        ) {
+        if (closeWindow && closeWindowFastpath && !this._removingTabs.length) {
           // This call actually closes the window, unless the user
           // cancels the operation.  We are finished here in both cases.
           this._windowIsClosing = window.closeWindow(
@@ -6279,8 +6275,9 @@
 
     // Disable "Close Tabs to the Right" if there are no tabs
     // following it.
-    document.getElementById("context_closeTabsToTheEnd").disabled =
-      gBrowser.getTabsToTheEndFrom(this.contextTab).length == 0;
+    document.getElementById(
+      "context_closeTabsToTheEnd"
+    ).disabled = !gBrowser.getTabsToTheEndFrom(this.contextTab).length;
 
     // Disable "Close other Tabs" if there are no unpinned tabs.
     let unpinnedTabsToClose = multiselectionContext
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/forms/browser_selectpopup.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/forms/browser_selectpopup.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/forms/browser_selectpopup.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/forms/browser_selectpopup.js	2019-09-15 11:33:06.000000000 +0000
@@ -88,7 +88,7 @@
   "<html><body>" +
   "<div id='div'>" +
   "<iframe id='frame' width='320' height='295' style='border: none;'" +
-  "        src='data:text/html,<select id=select autofocus><option>he he he</option><option>boo boo</option><option>baz baz</option></select>'" +
+  "        src='data:text/html,<select id=select><option>he he he</option><option>boo boo</option><option>baz baz</option></select>'" +
   "</iframe>" +
   "</div></body></html>";
 
@@ -397,6 +397,20 @@
   const pageUrl = "data:text/html," + escape(PAGECONTENT_TRANSLATED);
   let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, pageUrl);
 
+  // We need to explicitly call Element.focus() since dataURL is treated as
+  // cross-origin, thus autofocus doesn't work there.
+  const iframe = await SpecialPowers.spawn(tab.linkedBrowser, [], () => {
+    return content.document.querySelector("iframe").browsingContext;
+  });
+  await SpecialPowers.spawn(iframe, [], async () => {
+    const input = content.document.getElementById("select");
+    const focusPromise = new Promise(resolve => {
+      input.addEventListener("focus", resolve, { once: true });
+    });
+    input.focus();
+    await focusPromise;
+  });
+
   let menulist = document.getElementById("ContentSelectDropdown");
   let selectPopup = menulist.menupopup;
 
@@ -783,7 +797,7 @@
     );
 
     // Don't check the scroll position for the last step as the popup will be cut off.
-    if (positions.length > 0) {
+    if (positions.length) {
       let cs = win.getComputedStyle(selectPopup);
       let bpBottom =
         parseFloat(cs.paddingBottom) + parseFloat(cs.borderBottomWidth);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/general/browser_contentAreaClick.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/general/browser_contentAreaClick.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/general/browser_contentAreaClick.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/general/browser_contentAreaClick.js	2019-09-15 11:33:06.000000000 +0000
@@ -291,11 +291,11 @@
     gCurrentTest.setup();
   }
 
-  if (gCurrentTest.targets.length == 0) {
+  if (!gCurrentTest.targets.length) {
     info(gCurrentTest.desc + ": cleaning up...");
     gCurrentTest.clean();
 
-    if (gTests.length > 0) {
+    if (gTests.length) {
       gCurrentTest = gTests.shift();
       gCurrentTest.setup();
     } else {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/general/browser_contentSearchUI.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/general/browser_contentSearchUI.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/general/browser_contentSearchUI.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/general/browser_contentSearchUI.js	2019-09-15 11:33:06.000000000 +0000
@@ -746,10 +746,10 @@
       s => s.type == "formHistory"
     ),
 
-    tableHidden: expectedSuggestions.length == 0,
+    tableHidden: !expectedSuggestions.length,
 
     inputValue: expectedInputVal,
-    ariaExpanded: expectedSuggestions.length == 0 ? "false" : "true",
+    ariaExpanded: !expectedSuggestions.length ? "false" : "true",
   };
   if (expectedSelectedButtonIdx != undefined) {
     expectedState.selectedButtonIndex = expectedSelectedButtonIdx;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/performance/browser_startup_content.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/performance/browser_startup_content.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/performance/browser_startup_content.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/performance/browser_startup_content.js	2019-09-15 11:33:06.000000000 +0000
@@ -77,7 +77,7 @@
   processScripts: new Set([
     "chrome://global/content/process-content.js",
     "resource:///modules/ContentObservers.js",
-    "data:,ChromeUtils.import('resource://gre/modules/ExtensionProcessScript.jsm')",
+    "resource://gre/modules/extensionProcessScriptLoader.js",
     "resource://devtools/client/jsonview/converter-observer.js",
     "resource://gre/modules/WebRequestContent.js",
   ]),
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/performance/browser_startup_content_mainthreadio.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/performance/browser_startup_content_mainthreadio.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/performance/browser_startup_content_mainthreadio.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/performance/browser_startup_content_mainthreadio.js	2019-09-15 11:33:06.000000000 +0000
@@ -400,7 +400,7 @@
     // no I/O marker in that case, but it's good to keep the test running to check
     // that we are still able to produce startup profiles.
     is(
-      markers.length > 0,
+      !!markers.length,
       !AppConstants.RELEASE_OR_BETA,
       procName +
         " startup profiles should have IO markers in builds that are not RELEASE_OR_BETA"
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/performance/browser_startup_flicker.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/performance/browser_startup_flicker.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/performance/browser_startup_flicker.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/performance/browser_startup_flicker.js	2019-09-15 11:33:06.000000000 +0000
@@ -16,7 +16,7 @@
   // Ensure all the frame data is in the test compartment to avoid traversing
   // a cross compartment wrapper for each pixel.
   let frames = Cu.cloneInto(startupRecorder.data.frames, {});
-  ok(frames.length > 0, "Should have captured some frames.");
+  ok(!!frames.length, "Should have captured some frames.");
 
   let unexpectedRects = 0;
   let alreadyFocused = false;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/plugins/head.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/plugins/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/plugins/head.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/plugins/head.js	2019-09-15 11:33:06.000000000 +0000
@@ -471,7 +471,7 @@
     if (!elems || elems.length < 1) {
       elems = doc.getElementsByTagName("object");
     }
-    if (elems && elems.length > 0) {
+    if (elems && elems.length) {
       elems[0].clientTop;
     }
   });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/popupNotifications/browser_popupNotification_4.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/popupNotifications/browser_popupNotification_4.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/popupNotifications/browser_popupNotification_4.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/popupNotifications/browser_popupNotification_4.js	2019-09-15 11:33:06.000000000 +0000
@@ -133,7 +133,7 @@
       let anchor = win.document.getElementById("default-notification-icon");
       win.PopupNotifications._reshowNotifications(anchor);
       ok(
-        win.PopupNotifications.panel.children.length == 0,
+        !win.PopupNotifications.panel.children.length,
         "no notification displayed in new window"
       );
       ok(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/popupNotifications/browser_popupNotification_5.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/popupNotifications/browser_popupNotification_5.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/popupNotifications/browser_popupNotification_5.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/popupNotifications/browser_popupNotification_5.js	2019-09-15 11:33:06.000000000 +0000
@@ -247,7 +247,7 @@
       let anchor = win.document.getElementById("default-notification-icon");
       win.PopupNotifications._reshowNotifications(anchor);
       ok(
-        win.PopupNotifications.panel.children.length == 0,
+        !win.PopupNotifications.panel.children.length,
         "no notification displayed in new window"
       );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/popupNotifications/head.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/popupNotifications/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/popupNotifications/head.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/popupNotifications/head.js	2019-09-15 11:33:06.000000000 +0000
@@ -69,7 +69,7 @@
 }
 
 async function runNextTest() {
-  if (tests.length == 0) {
+  if (!tests.length) {
     executeSoon(finish);
     return;
   }
@@ -246,7 +246,7 @@
       "main action highlight matches"
     );
   }
-  if (notifyObj.secondaryActions && notifyObj.secondaryActions.length > 0) {
+  if (notifyObj.secondaryActions && notifyObj.secondaryActions.length) {
     let secondaryAction = notifyObj.secondaryActions[0];
     is(
       notification.getAttribute("secondarybuttonlabel"),
@@ -330,7 +330,7 @@
 
 function triggerMainCommand(popup) {
   let notifications = popup.childNodes;
-  ok(notifications.length > 0, "at least one notification displayed");
+  ok(!!notifications.length, "at least one notification displayed");
   let notification = notifications[0];
   info("Triggering main command for notification " + notification.id);
   EventUtils.synthesizeMouseAtCenter(notification.button, {});
@@ -338,7 +338,7 @@
 
 function triggerSecondaryCommand(popup, index) {
   let notifications = popup.childNodes;
-  ok(notifications.length > 0, "at least one notification displayed");
+  ok(!!notifications.length, "at least one notification displayed");
   let notification = notifications[0];
   info("Triggering secondary command for notification " + notification.id);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/webextensions/browser_permissions_local_file.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/webextensions/browser_permissions_local_file.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/webextensions/browser_permissions_local_file.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/webextensions/browser_permissions_local_file.js	2019-09-15 11:33:06.000000000 +0000
@@ -51,7 +51,7 @@
 
   // Make sure we got some data.
   ok(
-    snapshot.parent && snapshot.parent.length > 0,
+    snapshot.parent && !!snapshot.parent.length,
     "Got parent telemetry events in the snapshot"
   );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/webextensions/head.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/webextensions/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/webextensions/head.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/webextensions/head.js	2019-09-15 11:33:06.000000000 +0000
@@ -255,7 +255,7 @@
     permissions.length,
     `Permissions list has ${permissions.length} entries`
   );
-  if (permissions.length == 0) {
+  if (!permissions.length) {
     is(header.getAttribute("hidden"), "true", "Permissions header is hidden");
     is(
       learnMoreLink.getAttribute("hidden"),
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/webrtc/browser_devices_get_user_media_paused.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/webrtc/browser_devices_get_user_media_paused.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/test/webrtc/browser_devices_get_user_media_paused.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/test/webrtc/browser_devices_get_user_media_paused.js	2019-09-15 11:33:06.000000000 +0000
@@ -45,7 +45,7 @@
       clones.filter(t => t.kind == "video").forEach(t => t.stop());
     }
     let liveClones = clones.filter(t => t.readyState == "live");
-    if (liveClones.length == 0) {
+    if (!liveClones.length) {
       delete content.wrappedJSObject.gClones;
     } else {
       content.wrappedJSObject.gClones = liveClones;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/utilityOverlay.js firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/utilityOverlay.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/base/content/utilityOverlay.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/base/content/utilityOverlay.js	2019-09-15 11:33:06.000000000 +0000
@@ -888,7 +888,7 @@
     aEvent.getModifierState(modifier)
   );
   // Check if aEvent has a modifier and aKey doesn't
-  if (eventModifiers.length > 0 && keyModifiers.length == 0) {
+  if (eventModifiers.length && !keyModifiers.length) {
     return false;
   }
   // Check whether aKey's modifiers match aEvent's modifiers
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/about/AboutPrivateBrowsingHandler.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/about/AboutPrivateBrowsingHandler.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/about/AboutPrivateBrowsingHandler.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/about/AboutPrivateBrowsingHandler.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -47,7 +47,7 @@
         let searchAlias = "";
         let searchAliases =
           Services.search.defaultEngine.wrappedJSObject.__internalAliases;
-        if (searchAliases && searchAliases.length > 0) {
+        if (searchAliases && searchAliases.length) {
           searchAlias = `${searchAliases[0]} `;
         }
         let urlBar = aMessage.target.browser.ownerGlobal.gURLBar;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutconfig/content/aboutconfig.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutconfig/content/aboutconfig.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutconfig/content/aboutconfig.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutconfig/content/aboutconfig.js	2019-09-15 11:33:06.000000000 +0000
@@ -592,7 +592,9 @@
   }
 
   if (searchName && !gExistingPrefs.has(searchName)) {
-    gPrefsTable.appendChild(new PrefRow(searchName).getElement());
+    let addPrefRow = new PrefRow(searchName);
+    addPrefRow.odd = odd;
+    gPrefsTable.appendChild(addPrefRow.getElement());
   }
 
   // We only start observing preference changes after the first search is done,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutconfig/test/browser/browser_edit.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutconfig/test/browser/browser_edit.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutconfig/test/browser/browser_edit.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutconfig/test/browser/browser_edit.js	2019-09-15 11:33:06.000000000 +0000
@@ -90,6 +90,49 @@
   }
 });
 
+add_task(async function test_click_type_label_multiple_forms() {
+  // This test displays the row to add a preference while other preferences are
+  // also displayed, and tries to select the type of the new preference by
+  // clicking the label next to the radio button. This should work even if the
+  // user has deleted a different preference, and multiple forms are displayed.
+  const PREF_TO_DELETE = "test.aboutconfig.modify.boolean";
+  const PREF_NEW_WHILE_DELETED = "test.aboutconfig.modify.";
+
+  await AboutConfigTest.withNewTab(async function() {
+    this.search(PREF_NEW_WHILE_DELETED);
+
+    // This preference will remain deleted during the test.
+    let existingRow = this.getRow(PREF_TO_DELETE);
+    existingRow.resetColumnButton.click();
+
+    let newRow = this.getRow(PREF_NEW_WHILE_DELETED);
+
+    for (let [radioIndex, expectedValue] of [[0, true], [1, 0], [2, ""]]) {
+      let radioLabels = newRow.element.querySelectorAll("label > span");
+      await this.document.l10n.translateElements(radioLabels);
+
+      // Even if this is the second form on the page, the click should select
+      // the radio button next to the label, not the one on the first form.
+      await BrowserTestUtils.synthesizeMouseAtCenter(
+        radioLabels[radioIndex],
+        {},
+        this.browser
+      );
+
+      // Adding the preference should set the default for the data type.
+      newRow.editColumnButton.click();
+      Assert.ok(Preferences.get(PREF_NEW_WHILE_DELETED) === expectedValue);
+
+      // Reset the preference, then continue by adding a different type.
+      newRow.resetColumnButton.click();
+    }
+
+    // Re-adding the deleted preference should restore the value.
+    existingRow.editColumnButton.click();
+    Assert.ok(Preferences.get(PREF_TO_DELETE) === true);
+  });
+});
+
 add_task(async function test_reset_user_pref() {
   await SpecialPowers.pushPrefEnv({
     set: [
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutconfig/test/browser/browser_search.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutconfig/test/browser/browser_search.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutconfig/test/browser/browser_search.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutconfig/test/browser/browser_search.js	2019-09-15 11:33:06.000000000 +0000
@@ -6,7 +6,7 @@
     set: [
       ["test.aboutconfig.a", "test value 1"],
       ["test.aboutconfig.ab", "test value 2"],
-      ["test.aboutconfig.b", "test value 3"],
+      ["test.aboutconfig.bc", "test value 3"],
     ],
   });
 });
@@ -143,3 +143,17 @@
     Assert.equal(this.rows.length, 1);
   });
 });
+
+add_task(async function test_search_add_row_color() {
+  await AboutConfigTest.withNewTab(async function() {
+    // When the row is the only one displayed, it doesn't have the "odd" class.
+    this.search("test.aboutconfig.add");
+    Assert.equal(this.rows.length, 1);
+    Assert.ok(!this.getRow("test.aboutconfig.add").hasClass("odd"));
+
+    // When displayed with one other preference, the "odd" class is present.
+    this.search("test.aboutconfig.b");
+    Assert.equal(this.rows.length, 2);
+    Assert.ok(this.getRow("test.aboutconfig.b").hasClass("odd"));
+  });
+});
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutlogins/content/aboutLogins.html firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutlogins/content/aboutLogins.html
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutlogins/content/aboutLogins.html	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutlogins/content/aboutLogins.html	2019-09-15 11:33:06.000000000 +0000
@@ -103,7 +103,9 @@
           <span data-l10n-id="about-logins-login-list-empty-search-description"></span>
         </div>
       </div>
-      <button class="create-login-button" data-l10n-id="create-login-button"></button>
+      <div class="create-login-button-container">
+        <button class="create-login-button" data-l10n-id="create-login-button"></button>
+      </div>
     </template>
 
     <template id="login-list-item-template">
@@ -115,6 +117,7 @@
           <span class="title" dir="auto"></span>
           <span class="username" dir="ltr"></span>
         </div>
+        <img data-l10n-id="about-logins-list-item-warning-icon" class="list-item-warning-icon" alt="" title="" src="chrome://global/skin/icons/warning.svg"/>
       </li>
     </template>
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutlogins/content/components/fxaccounts-button.css firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutlogins/content/components/fxaccounts-button.css
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutlogins/content/components/fxaccounts-button.css	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutlogins/content/components/fxaccounts-button.css	2019-09-15 11:33:06.000000000 +0000
@@ -52,3 +52,11 @@
 .fxaccounts-avatar-button:hover:active .fxaccount-avatar {
   border-color: var(--in-content-border-active);
 }
+
+.fxaccounts-avatar-button:hover {
+  background-color: transparent !important;
+}
+
+.fxaccounts-avatar-button:hover > .fxaccount-email {
+  text-decoration: underline;
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutlogins/content/components/login-list.css firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutlogins/content/components/login-list.css
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutlogins/content/components/login-list.css	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutlogins/content/components/login-list.css	2019-09-15 11:33:06.000000000 +0000
@@ -35,6 +35,12 @@
   font-weight: normal;
 }
 
+#login-sort:-moz-focusring { /* This is a workaround due to Bug 1580935 */
+  color: transparent !important;
+  fill: var(--in-content-text-color);
+  text-shadow: 0 0 0 var(--in-content-text-color);
+}
+
 .count {
   flex-grow: 1;
   text-align: end;
@@ -76,13 +82,18 @@
   padding-inline-start: 0;
   overflow: hidden auto;
   flex-grow: 1;
-  box-shadow: inset 0 -1px var(--in-content-box-border-color);
 }
 
 .create-login-button {
   margin: 16px;
 }
 
+.create-login-button-container {
+  box-shadow: 0 -1px var(--in-content-box-border-color);
+  display: flex;
+  flex-direction: column;
+}
+
 .login-list-item {
   display: flex;
   align-items: center;
@@ -153,22 +164,20 @@
   color: var(--in-content-deemphasized-text);
 }
 
-.login-list-item.breached {
-  padding-inline-end: 48px;
-  background-image: url("chrome://global/skin/icons/warning.svg");
-  background-position: right 24px center;
-  background-repeat: no-repeat;
-  -moz-context-properties: fill;
-  fill: var(--red-90);
+:not(.breached) > .list-item-warning-icon {
+  display: none;
 }
 
-.login-list-item.breached:dir(rtl) {
-  background-position: left 24px center;
+.breached > .list-item-warning-icon {
+  -moz-context-properties: fill;
+  fill: var(--red-90);
+  min-width: 16px;
+  margin-inline-start: 12px;
 }
 
 @supports -moz-bool-pref("browser.in-content.dark-mode") {
   @media (prefers-color-scheme: dark) {
-    .login-list-item.breached {
+    .breached > .list-item-warning-icon {
       fill: var(--red-60);
     }
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutlogins/tests/browser/browser_loginListChanges.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutlogins/tests/browser/browser_loginListChanges.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutlogins/tests/browser/browser_loginListChanges.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutlogins/tests/browser/browser_loginListChanges.js	2019-09-15 11:33:06.000000000 +0000
@@ -70,7 +70,7 @@
   await ContentTask.spawn(browser, login, async removedLogin => {
     let loginList = Cu.waiveXrays(content.document.querySelector("login-list"));
     let loginRemoved = await ContentTaskUtils.waitForCondition(() => {
-      return loginList._loginGuidsSortedOrder.length == 0;
+      return !loginList._loginGuidsSortedOrder.length;
     }, "Waiting for login to get removed");
     ok(loginRemoved, "The login should be removed from the page");
   });
@@ -121,7 +121,7 @@
   await ContentTask.spawn(browser, null, async () => {
     let loginList = Cu.waiveXrays(content.document.querySelector("login-list"));
     let loginFound = await ContentTaskUtils.waitForCondition(() => {
-      return loginList._loginGuidsSortedOrder.length == 0;
+      return !loginList._loginGuidsSortedOrder.length;
     }, "Waiting for logins to be cleared");
     ok(loginFound, "Logins should be cleared");
     ok(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutlogins/tests/chrome/test_login_list.html firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutlogins/tests/chrome/test_login_list.html
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/aboutlogins/tests/chrome/test_login_list.html	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/aboutlogins/tests/chrome/test_login_list.html	2019-09-15 11:33:06.000000000 +0000
@@ -213,8 +213,12 @@
 add_task(async function test_breach_indicator() {
   gLoginList.updateBreaches(TEST_BREACHES_MAP);
   let loginListItems = gLoginList.shadowRoot.querySelectorAll(".login-list-item:not(#new-login-list-item):not([hidden])");
+  let warningIcon = loginListItems[0].querySelector(".list-item-warning-icon");
+  let hiddenWarningIcon = loginListItems[1].querySelector(".list-item-warning-icon");
   ok(loginListItems[0].classList.contains("breached"), "The first login should have the .breached class.");
+  ok(!isHidden(warningIcon), "The warning icon for a breached login should not be hidden.");
   ok(!loginListItems[1].classList.contains("breached"), "The second login should not have the .breached class");
+  ok(isHidden(hiddenWarningIcon), "The warning icon for a login without an associated breach should be hidden.");
 });
 
 add_task(async function test_filtered_list() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/contextualidentity/test/browser/file_reflect_cookie_into_title.html firefox-trunk-71.0~a1~hg20190915r493291/browser/components/contextualidentity/test/browser/file_reflect_cookie_into_title.html
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/contextualidentity/test/browser/file_reflect_cookie_into_title.html	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/contextualidentity/test/browser/file_reflect_cookie_into_title.html	2019-09-15 11:33:06.000000000 +0000
@@ -4,7 +4,7 @@
     <title>title not set</title>
     <script>
       // if we have a query string, use it to set the cookie and localStorage
-      if (window.location.search.length > 0) {
+      if (window.location.search.length) {
         let context_name = window.location.search.substr(1);
         document.cookie = "userContextId=" + context_name;
         localStorage.setItem("userContext", context_name);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/contextualidentity/test/browser/file_set_storages.html firefox-trunk-71.0~a1~hg20190915r493291/browser/components/contextualidentity/test/browser/file_set_storages.html
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/contextualidentity/test/browser/file_set_storages.html	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/contextualidentity/test/browser/file_set_storages.html	2019-09-15 11:33:06.000000000 +0000
@@ -8,7 +8,7 @@
       "use strict";
 
       // if we have a query string, use it to set storages
-      if (window.location.search.length > 0) {
+      if (window.location.search.length) {
         let context_name = window.location.search.substr(1);
         localStorage.setItem("userContext", context_name);
         sessionStorage.setItem("userContext", context_name);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/customizableui/content/panelUI.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/customizableui/content/panelUI.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/customizableui/content/panelUI.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/customizableui/content/panelUI.js	2019-09-15 11:33:06.000000000 +0000
@@ -820,7 +820,7 @@
       if (!notifications[0].options.badgeOnly) {
         this._showBannerItem(notifications[0]);
       }
-    } else if (doorhangers.length > 0) {
+    } else if (doorhangers.length) {
       // Only show the doorhanger if the window is focused and not fullscreen
       if (
         (window.fullScreen && this.autoHideToolbarInFullScreen) ||
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/customizableui/CustomizableWidgets.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/customizableui/CustomizableWidgets.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/customizableui/CustomizableWidgets.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/customizableui/CustomizableWidgets.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -767,7 +767,7 @@
 
       attachFragment.appendChild(clientItem);
 
-      if (client.tabs.length == 0) {
+      if (!client.tabs.length) {
         let label = this._appendMessageLabel(
           "notabsforclientlabel",
           attachFragment
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/customizableui/test/browser_1007336_lwthemes_in_customize_mode.js	2019-09-15 11:33:06.000000000 +0000
@@ -123,7 +123,7 @@
     "toolbarbutton.customization-lwtheme-menu-theme[active]"
   );
   is(activeThemes.length, 1, "Exactly 1 theme should be selected");
-  if (activeThemes.length > 0) {
+  if (activeThemes.length) {
     is(
       activeThemes[0].theme.id,
       LIGHT_THEME_ID,
@@ -155,7 +155,7 @@
     "toolbarbutton.customization-lwtheme-menu-theme[active]"
   );
   is(activeThemes.length, 1, "Exactly 1 theme should be selected");
-  if (activeThemes.length > 0) {
+  if (activeThemes.length) {
     is(
       activeThemes[0].theme.id,
       "my-theme-5@example.com",
@@ -183,7 +183,7 @@
     "toolbarbutton.customization-lwtheme-menu-theme[active]"
   );
   is(activeThemes.length, 1, "Exactly 1 theme should be selected");
-  if (activeThemes.length > 0) {
+  if (activeThemes.length) {
     is(
       activeThemes[0].theme.id,
       firstLWThemeId,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/customizableui/test/browser_lwt_telemetry.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/customizableui/test/browser_lwt_telemetry.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/customizableui/test/browser_lwt_telemetry.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/customizableui/test/browser_lwt_telemetry.js	2019-09-15 11:33:06.000000000 +0000
@@ -41,7 +41,7 @@
 
   // Make sure we got some data.
   ok(
-    snapshot.parent && snapshot.parent.length > 0,
+    snapshot.parent && !!snapshot.parent.length,
     "Got parent telemetry events in the snapshot"
   );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/downloads/content/allDownloadsView.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/downloads/content/allDownloadsView.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/downloads/content/allDownloadsView.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/downloads/content/allDownloadsView.js	2019-09-15 11:33:06.000000000 +0000
@@ -337,7 +337,7 @@
   },
 
   get hasSelection() {
-    return this.selectedNodes.length > 0;
+    return !!this.selectedNodes.length;
   },
 
   get controller() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/downloads/DownloadsCommon.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/downloads/DownloadsCommon.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/downloads/DownloadsCommon.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/downloads/DownloadsCommon.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -983,7 +983,7 @@
    */
   addView(aView) {
     // Start receiving events when the first of our views is registered.
-    if (this._views.length == 0) {
+    if (!this._views.length) {
       if (this._isPrivate) {
         PrivateDownloadsData.addView(this);
       } else {
@@ -1021,7 +1021,7 @@
     }
 
     // Stop receiving events when the last of our views is unregistered.
-    if (this._views.length == 0) {
+    if (!this._views.length) {
       if (this._isPrivate) {
         PrivateDownloadsData.removeView(this);
       } else {
@@ -1175,7 +1175,7 @@
   removeView(aView) {
     DownloadsViewPrototype.removeView.call(this, aView);
 
-    if (this._views.length == 0) {
+    if (!this._views.length) {
       this._itemCount = 0;
     }
   },
@@ -1393,7 +1393,7 @@
   removeView(aView) {
     DownloadsViewPrototype.removeView.call(this, aView);
 
-    if (this._views.length == 0) {
+    if (!this._views.length) {
       // Clear out our collection of Download objects. If we ever have
       // another view registered with us, this will get re-populated.
       this._downloads = [];
@@ -1448,7 +1448,7 @@
    * which was set when constructing this DownloadsSummaryData instance.
    */
   *_downloadsForSummary() {
-    if (this._downloads.length > 0) {
+    if (this._downloads.length) {
       for (let i = this._numToExclude; i < this._downloads.length; ++i) {
         yield this._downloads[i];
       }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/enterprisepolicies/content/aboutPolicies.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/enterprisepolicies/content/aboutPolicies.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/enterprisepolicies/content/aboutPolicies.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/enterprisepolicies/content/aboutPolicies.js	2019-09-15 11:33:06.000000000 +0000
@@ -169,7 +169,7 @@
         generatePolicy(data[count], new_row, depth + 1, new_cont, false, false);
       }
     }
-  } else if (typeof data == "object" && Object.keys(data).length > 0) {
+  } else if (typeof data == "object" && Object.keys(data).length) {
     let count = 0;
     for (let obj in data) {
       if (count == 0) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/enterprisepolicies/Policies.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/enterprisepolicies/Policies.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/enterprisepolicies/Policies.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/enterprisepolicies/Policies.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -869,7 +869,7 @@
       // (and therefore what the pref |browser.startup.homepage|) accepts.
       if (param.URL) {
         let homepages = param.URL.href;
-        if (param.Additional && param.Additional.length > 0) {
+        if (param.Additional && param.Additional.length) {
           homepages += "|" + param.Additional.map(url => url.href).join("|");
         }
         setDefaultPref("browser.startup.homepage", homepages, param.Locked);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/parent/ext-chrome-settings-overrides.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/parent/ext-chrome-settings-overrides.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/parent/ext-chrome-settings-overrides.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/parent/ext-chrome-settings-overrides.js	2019-09-15 11:33:06.000000000 +0000
@@ -236,7 +236,7 @@
 
     try {
       let engines = await Services.search.getEnginesByExtensionID(id);
-      if (engines.length > 0) {
+      if (engines.length) {
         await Services.search.removeWebExtensionEngine(id);
       }
     } catch (e) {
@@ -455,7 +455,7 @@
       !extension.addonData.builtIn
     ) {
       let engines = await Services.search.getEnginesByExtensionID(extension.id);
-      if (engines.length > 0) {
+      if (engines.length) {
         let firstEngine = engines[0];
         let firstEngineName = firstEngine.name;
         // There can be only one engine right now
@@ -470,7 +470,7 @@
     }
     try {
       let engines = await Services.search.addEnginesFromExtension(extension);
-      if (engines.length > 0) {
+      if (engines.length) {
         await ExtensionSettingsStore.initialize();
         await ExtensionSettingsStore.addSetting(
           extension.id,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/parent/ext-menus.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/parent/ext-menus.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/parent/ext-menus.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/parent/ext-menus.js	2019-09-15 11:33:06.000000000 +0000
@@ -312,7 +312,7 @@
   buildSingleElement(item, contextData) {
     let doc = contextData.menu.ownerDocument;
     let element;
-    if (item.children.length > 0) {
+    if (item.children.length) {
       element = this.createMenuElement(doc, item);
     } else if (item.type == "separator") {
       element = doc.createXULElement("menuseparator");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/parent/ext-sessions.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/parent/ext-sessions.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/parent/ext-sessions.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/parent/ext-sessions.js	2019-09-15 11:33:06.000000000 +0000
@@ -180,7 +180,7 @@
               }
             }
 
-            if (recentlyClosedTabs.length > 0) {
+            if (recentlyClosedTabs.length) {
               // Sort the tabs.
               recentlyClosedTabs.sort((a, b) => b.closedAt - a.closedAt);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/parent/ext-tabs.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/parent/ext-tabs.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/parent/ext-tabs.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/parent/ext-tabs.js	2019-09-15 11:33:06.000000000 +0000
@@ -1592,7 +1592,7 @@
               }
             }
           }
-          if (hidden.length > 0) {
+          if (hidden.length) {
             let win = Services.wm.getMostRecentWindow("navigator:browser");
             tabHidePopup.open(win, extension.id);
           }
@@ -1616,7 +1616,7 @@
 
           if (!Array.isArray(tabs)) {
             tabs = [tabs];
-          } else if (tabs.length == 0) {
+          } else if (!tabs.length) {
             throw new ExtensionError("No highlighted tab.");
           }
           window.gBrowser.selectedTabs = tabs.map(tabIndex => {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_addon_debugging_netmonitor.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_addon_debugging_netmonitor.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_addon_debugging_netmonitor.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_addon_debugging_netmonitor.js	2019-09-15 11:33:06.000000000 +0000
@@ -63,7 +63,7 @@
       filterRequest
     );
 
-    return requests.length > 0;
+    return !!requests.length;
   });
 
   // Call a function defined in the target extension to make assertions
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_browsingData_pluginData.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_browsingData_pluginData.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_browsingData_pluginData.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_browsingData_pluginData.js	2019-09-15 11:33:06.000000000 +0000
@@ -36,7 +36,7 @@
   return ContentTask.spawn(browser, {}, async function() {
     let doc = content.document;
     let elems = doc.getElementsByTagName("embed");
-    if (elems && elems.length > 0) {
+    if (elems && elems.length) {
       elems[0].clientTop; // eslint-disable-line no-unused-expressions
     }
   });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_browsingData_serviceWorkers.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_browsingData_serviceWorkers.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_browsingData_serviceWorkers.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_browsingData_serviceWorkers.js	2019-09-15 11:33:06.000000000 +0000
@@ -90,7 +90,7 @@
   await extension.awaitMessage("serviceWorkersRemoved");
 
   // The serviceWorkers and not necessarily removed immediately.
-  while (serviceWorkers.length > 0) {
+  while (serviceWorkers.length) {
     serviceWorkers = serviceWorkerManager.getAllRegistrations();
     await new Promise(resolve => setTimeout(resolve, 1));
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_devtools_panel.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_devtools_panel.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_devtools_panel.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_devtools_panel.js	2019-09-15 11:33:06.000000000 +0000
@@ -440,7 +440,7 @@
   );
   const panelInfo = getPanelInfo(toolbox);
   ok(
-    panelInfo.panelLabel && panelInfo.panelLabel.length > 0,
+    panelInfo.panelLabel && !!panelInfo.panelLabel.length,
     "Expect the registered panel to include a non empty panelLabel property"
   );
   is(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_sidebarAction_windows.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_sidebarAction_windows.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_sidebarAction_windows.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_sidebarAction_windows.js	2019-09-15 11:33:06.000000000 +0000
@@ -43,7 +43,7 @@
   let elements = document.getElementsByClassName("webextension-menuitem");
   // ui is in flux, at time of writing we potentially have 3 menuitems, later
   // it may be two or one, just make sure one is there.
-  ok(elements.length > 0, "have a menuitem");
+  ok(!!elements.length, "have a menuitem");
   let style = elements[0].getAttribute("style");
   ok(style.includes("webextension-menuitem-image"), "this menu has style");
 
@@ -60,7 +60,7 @@
   );
   // Check that the menuitem has our image styling.
   elements = win.document.getElementsByClassName("webextension-menuitem");
-  ok(elements.length > 0, "have a menuitem");
+  ok(!!elements.length, "have a menuitem");
   style = elements[0].getAttribute("style");
   ok(style.includes("webextension-menuitem-image"), "this menu has style");
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_webNavigation_getFrames.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_webNavigation_getFrames.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/browser_ext_webNavigation_getFrames.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/browser_ext_webNavigation_getFrames.js	2019-09-15 11:33:06.000000000 +0000
@@ -83,7 +83,7 @@
         while (
           getAllFramesDetails.filter(
             details => details.frameId == nonExistentFrameId
-          ).length > 0
+          ).length
         ) {
           nonExistentFrameId += 1;
         }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/head.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/extensions/test/browser/head.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/extensions/test/browser/head.js	2019-09-15 11:33:06.000000000 +0000
@@ -502,7 +502,7 @@
   );
 
   // Return null if the extension only has one item and therefore no extension menu.
-  if (topLevelMenu.length == 0) {
+  if (!topLevelMenu.length) {
     return null;
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/360seProfileMigrator.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/360seProfileMigrator.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/360seProfileMigrator.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/360seProfileMigrator.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -317,7 +317,7 @@
 
   this.__sourceProfiles = profiles.filter(profile => {
     let resources = this.getResources(profile);
-    return resources && resources.length > 0;
+    return resources && !!resources.length;
   });
   return this.__sourceProfiles;
 };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/ChromeProfileMigrator.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/ChromeProfileMigrator.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/ChromeProfileMigrator.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/ChromeProfileMigrator.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -185,7 +185,7 @@
   // Only list profiles from which any data can be imported
   this.__sourceProfiles = profileResources
     .filter(({ resources }) => {
-      return resources && resources.length > 0;
+      return resources && !!resources.length;
     }, this)
     .map(({ profile }) => profile);
   return this.__sourceProfiles;
@@ -220,10 +220,7 @@
         let roots = JSON.parse(bookmarkJSON).roots;
 
         // Importing bookmark bar items
-        if (
-          roots.bookmark_bar.children &&
-          roots.bookmark_bar.children.length > 0
-        ) {
+        if (roots.bookmark_bar.children && roots.bookmark_bar.children.length) {
           // Toolbar
           let parentGuid = PlacesUtils.bookmarks.toolbarGuid;
           let bookmarks = convertBookmarks(
@@ -243,7 +240,7 @@
         }
 
         // Importing bookmark menu items
-        if (roots.other.children && roots.other.children.length > 0) {
+        if (roots.other.children && roots.other.children.length) {
           // Bookmark menu
           let parentGuid = PlacesUtils.bookmarks.menuGuid;
           let bookmarks = convertBookmarks(roots.other.children, errorGatherer);
@@ -329,7 +326,7 @@
           }
         }
 
-        if (pageInfos.length > 0) {
+        if (pageInfos.length) {
           await MigrationUtils.insertVisitsWrapper(pageInfos);
         }
       })().then(
@@ -520,7 +517,7 @@
         }
       }
       try {
-        if (logins.length > 0) {
+        if (logins.length) {
           await MigrationUtils.insertLoginsWrapper(logins);
         }
       } catch (e) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/EdgeProfileMigrator.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/EdgeProfileMigrator.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/EdgeProfileMigrator.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/EdgeProfileMigrator.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -163,7 +163,7 @@
       });
     }
 
-    if (pageInfos.length == 0) {
+    if (!pageInfos.length) {
       aCallback(typedURLs.size == 0);
       return;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/IEProfileMigrator.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/IEProfileMigrator.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/IEProfileMigrator.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/IEProfileMigrator.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -69,7 +69,7 @@
 
       let title = entry.get("title");
       // Embed visits have no title and don't need to be imported.
-      if (title.length == 0) {
+      if (!title.length) {
         continue;
       }
 
@@ -93,7 +93,7 @@
     }
 
     // Check whether there is any history to import.
-    if (pageInfos.length == 0) {
+    if (!pageInfos.length) {
       aCallback(true);
       return;
     }
@@ -235,7 +235,7 @@
       }
     }
 
-    if (logins.length > 0) {
+    if (logins.length) {
       await MigrationUtils.insertLoginsWrapper(logins);
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/MigrationUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/MigrationUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/MigrationUtils.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/MigrationUtils.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -244,7 +244,7 @@
    */
   migrate: async function MP_migrate(aItems, aStartup, aProfile) {
     let resources = await this._getMaybeCachedResources(aProfile);
-    if (resources.length == 0) {
+    if (!resources.length) {
       throw new Error("migrate called for a non-existent source");
     }
 
@@ -481,11 +481,11 @@
       let profiles = await this.getSourceProfiles();
       if (!profiles) {
         let resources = await this._getMaybeCachedResources("");
-        if (resources && resources.length > 0) {
+        if (resources && resources.length) {
           exists = true;
         }
       } else {
-        exists = profiles.length > 0;
+        exists = !!profiles.length;
       }
     } catch (ex) {
       Cu.reportError(ex);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/MSMigrationUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/MSMigrationUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/MSMigrationUtils.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/MSMigrationUtils.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -669,7 +669,7 @@
     // Note the last record is an empty string...
     let records = [];
     let lines = aTextBuffer.split("\n");
-    while (lines.length > 0) {
+    while (lines.length) {
       let record = lines.splice(0, 9);
       // ... which means this is going to be a 1-element array for that record
       if (record.length > 1) {
@@ -680,7 +680,7 @@
       let [name, value, hostpath, flags, expireTimeLo, expireTimeHi] = record;
 
       // IE stores deleted cookies with a zero-length value, skip them.
-      if (value.length == 0) {
+      if (!value.length) {
         continue;
       }
 
@@ -696,7 +696,7 @@
 
       // For a non-null domain, assume it's what Mozilla considers
       // a domain cookie.  See bug 222343.
-      if (host.length > 0) {
+      if (host.length) {
         // Fist delete any possible extant matching host cookie.
         Services.cookies.remove(host, name, path, false, {});
         // Now make it a domain cookie.
@@ -970,7 +970,7 @@
         }
       }
 
-      if (logins.length > 0) {
+      if (logins.length) {
         await MigrationUtils.insertLoginsWrapper(logins);
       }
     } catch (e) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/SafariProfileMigrator.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/SafariProfileMigrator.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/SafariProfileMigrator.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/SafariProfileMigrator.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -113,7 +113,7 @@
       entriesFiltered = aEntries;
     }
 
-    if (entriesFiltered.length == 0) {
+    if (!entriesFiltered.length) {
       return;
     }
 
@@ -271,7 +271,7 @@
             }
           }
         }
-        if (pageInfos.length == 0) {
+        if (!pageInfos.length) {
           // If we failed at least once, then we didn't succeed in importing,
           // otherwise we didn't actually have anything to import, so we'll
           // report it as a success.
@@ -313,7 +313,7 @@
       return;
     }
 
-    let alreadyReading = this._callbacks.length > 0;
+    let alreadyReading = !!this._callbacks.length;
     this._callbacks.push(aCallback);
     if (!alreadyReading) {
       PropertyListUtils.read(this._file, aDict => {
@@ -346,7 +346,7 @@
 
         if (aDict.has("RecentSearchStrings")) {
           let recentSearchStrings = aDict.get("RecentSearchStrings");
-          if (recentSearchStrings && recentSearchStrings.length > 0) {
+          if (recentSearchStrings && recentSearchStrings.length) {
             let changes = recentSearchStrings.map(searchString => ({
               op: "add",
               fieldname: "searchbar-history",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/tests/unit/test_360se_bookmarks.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/tests/unit/test_360se_bookmarks.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/tests/unit/test_360se_bookmarks.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/tests/unit/test_360se_bookmarks.js	2019-09-15 11:33:06.000000000 +0000
@@ -42,7 +42,7 @@
       ) {
         gotFolder = true;
       }
-      if (expectedParents.length > 0 && event.title == label) {
+      if (expectedParents.length && event.title == label) {
         let index = expectedParents.indexOf(event.parentId);
         Assert.ok(index != -1, "Found expected parent");
         expectedParents.splice(index, 1);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/tests/unit/test_IE_bookmarks.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/tests/unit/test_IE_bookmarks.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/tests/unit/test_IE_bookmarks.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/tests/unit/test_IE_bookmarks.js	2019-09-15 11:33:06.000000000 +0000
@@ -23,7 +23,7 @@
       if (event.title != label) {
         itemCount++;
       }
-      if (expectedParents.length > 0 && event.title == label) {
+      if (expectedParents.length && event.title == label) {
         let index = expectedParents.indexOf(event.parentId);
         Assert.notEqual(index, -1);
         expectedParents.splice(index, 1);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/tests/unit/test_IE_history.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/tests/unit/test_IE_history.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/tests/unit/test_IE_history.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/tests/unit/test_IE_history.js	2019-09-15 11:33:06.000000000 +0000
@@ -45,6 +45,6 @@
     let entry = await PlacesUtils.history.fetch(url, { includeVisits: true });
     Assert.equal(entry.url, url, "Should have the correct URL");
     Assert.equal(entry.title, title, "Should have the correct title");
-    Assert.ok(entry.visits.length > 0, "Should have some visits");
+    Assert.ok(!!entry.visits.length, "Should have some visits");
   }
 });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/tests/unit/test_Safari_bookmarks.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/tests/unit/test_Safari_bookmarks.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/migration/tests/unit/test_Safari_bookmarks.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/migration/tests/unit/test_Safari_bookmarks.js	2019-09-15 11:33:06.000000000 +0000
@@ -29,7 +29,7 @@
       ) {
         gotFolder = true;
       }
-      if (expectedParents.length > 0 && event.title == label) {
+      if (expectedParents.length && event.title == label) {
         let index = expectedParents.indexOf(event.parentId);
         Assert.ok(index != -1, "Found expected parent");
         expectedParents.splice(index, 1);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/common/Reducers.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/common/Reducers.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/common/Reducers.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/common/Reducers.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -307,7 +307,7 @@
       });
       // Otherwise, append it
       if (!hasMatch) {
-        const initialized = !!(action.data.rows && action.data.rows.length > 0);
+        const initialized = !!(action.data.rows && !!action.data.rows.length);
         const section = Object.assign(
           { title: "", rows: [], enabled: false },
           action.data,
@@ -327,7 +327,7 @@
           // Disabling a section (SECTION_UPDATE with empty rows) does not retain pinned cards.
           if (
             action.data.rows &&
-            action.data.rows.length > 0 &&
+            !!action.data.rows.length &&
             section.rows.find(card => card.pinned)
           ) {
             const rows = Array.from(action.data.rows);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/docs/targeting-attributes.md	2019-09-15 11:33:06.000000000 +0000
@@ -39,6 +39,7 @@
 * [earliestFirefoxVersion](#earliestfirefoxversion)
 * [isFxABadgeEnabled](#isfxabadgeenabled)
 * [totalBlockedCount](#totalblockedcount)
+* [recentBookmarks](#recentbookmarks)
 
 ## Detailed usage
 
@@ -529,3 +530,19 @@
 ```ts
 declare const totalBlockedCount: number;
 ```
+
+### `recentBookmarks`
+
+An array of GUIDs of recent bookmarks as provided by [`NewTabUtils.getRecentBookmarks`](https://searchfox.org/mozilla-central/rev/e0b0c38ee83f99d3cf868bad525ace4a395039f1/toolkit/modules/NewTabUtils.jsm#1087)
+
+#### Definition
+
+```ts
+interface Bookmark {
+  bookmarkGuid: string;
+  url: string;
+  title: string;
+  ...
+}
+declare const recentBookmarks: Array<Bookmark>
+```
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/FXASignupSnippet/FXASignupSnippet.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/FXASignupSnippet/FXASignupSnippet.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/FXASignupSnippet/FXASignupSnippet.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/FXASignupSnippet/FXASignupSnippet.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -11,6 +11,7 @@
   const firefox_version = userAgent ? parseInt(userAgent[1], 10) : 0;
   const extendedContent = {
     scene1_button_label: schema.properties.scene1_button_label.default,
+    retry_button_label: schema.properties.retry_button_label.default,
     scene2_email_placeholder_text:
       schema.properties.scene2_email_placeholder_text.default,
     scene2_button_label: schema.properties.scene2_button_label.default,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/FXASignupSnippet/FXASignupSnippet.schema.json firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/FXASignupSnippet/FXASignupSnippet.schema.json
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/FXASignupSnippet/FXASignupSnippet.schema.json	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/FXASignupSnippet/FXASignupSnippet.schema.json	2019-09-15 11:33:06.000000000 +0000
@@ -128,6 +128,13 @@
       "type": "string",
       "description": "The background color of the button. Valid CSS color."
     },
+    "retry_button_label": {
+      "allOf": [
+        {"$ref": "#/definitions/plainText"},
+        {"description": "Text for the button in the event of a submission error/failure."}
+      ],
+      "default": "Try again"
+    },
     "do_not_autoblock": {
       "type": "boolean",
       "description": "Used to prevent blocking the snippet after the CTA (link or button) has been clicked",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/NewsletterSnippet/NewsletterSnippet.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/NewsletterSnippet/NewsletterSnippet.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/NewsletterSnippet/NewsletterSnippet.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/NewsletterSnippet/NewsletterSnippet.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -9,6 +9,7 @@
 export const NewsletterSnippet = props => {
   const extendedContent = {
     scene1_button_label: schema.properties.scene1_button_label.default,
+    retry_button_label: schema.properties.retry_button_label.default,
     scene2_email_placeholder_text:
       schema.properties.scene2_email_placeholder_text.default,
     scene2_button_label: schema.properties.scene2_button_label.default,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/NewsletterSnippet/NewsletterSnippet.schema.json firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/NewsletterSnippet/NewsletterSnippet.schema.json
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/NewsletterSnippet/NewsletterSnippet.schema.json	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/NewsletterSnippet/NewsletterSnippet.schema.json	2019-09-15 11:33:06.000000000 +0000
@@ -109,6 +109,13 @@
       "type": "string",
       "description": "The background color of the button. Valid CSS color."
     },
+    "retry_button_label": {
+      "allOf": [
+        {"$ref": "#/definitions/plainText"},
+        {"description": "Text for the button in the event of a submission error/failure."}
+      ],
+      "default": "Try again"
+    },
     "do_not_autoblock": {
       "type": "boolean",
       "description": "Used to prevent blocking the snippet after the CTA (link or button) has been clicked",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/SendToDeviceSnippet/SendToDeviceSnippet.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/SendToDeviceSnippet/SendToDeviceSnippet.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/SendToDeviceSnippet/SendToDeviceSnippet.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/SendToDeviceSnippet/SendToDeviceSnippet.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -42,6 +42,7 @@
     ...props,
     content: {
       scene1_button_label: schema.properties.scene1_button_label.default,
+      retry_button_label: schema.properties.retry_button_label.default,
       scene2_dismiss_button_text:
         schema.properties.scene2_dismiss_button_text.default,
       scene2_button_label: schema.properties.scene2_button_label.default,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/SendToDeviceSnippet/SendToDeviceSnippet.schema.json firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/SendToDeviceSnippet/SendToDeviceSnippet.schema.json
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/SendToDeviceSnippet/SendToDeviceSnippet.schema.json	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/SendToDeviceSnippet/SendToDeviceSnippet.schema.json	2019-09-15 11:33:06.000000000 +0000
@@ -150,6 +150,13 @@
       "type": "string",
       "description": "The background color of the button. Valid CSS color."
     },
+    "retry_button_label": {
+      "allOf": [
+        {"$ref": "#/definitions/plainText"},
+        {"description": "Text for the button in the event of a submission error/failure."}
+      ],
+      "default": "Try again"
+    },
     "do_not_autoblock": {
       "type": "boolean",
       "description": "Used to prevent blocking the snippet after the CTA (link or button) has been clicked",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/StartupOverlay/StartupOverlay.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/StartupOverlay/StartupOverlay.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/StartupOverlay/StartupOverlay.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/StartupOverlay/StartupOverlay.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -82,7 +82,7 @@
    */
   _getFormInfo() {
     const value = {
-      has_flow_params: this.props.flowParams.flowId.length > 0,
+      has_flow_params: !!this.props.flowParams.flowId.length,
     };
     return { value };
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -177,7 +177,7 @@
     const bodyText = isSuccess
       ? { success_text: content.success_text }
       : { error_text: content.error_text };
-    const retryButtonText = content.scene1_button_label;
+    const retryButtonText = content.retry_button_label;
     return (
       <SnippetBase {...this.props}>
         <div className="submissionStatus">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.schema.json firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.schema.json
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.schema.json	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/SubmitFormSnippet/SubmitFormSnippet.schema.json	2019-09-15 11:33:06.000000000 +0000
@@ -152,6 +152,13 @@
       "type": "string",
       "description": "The background color of the button. Valid CSS color."
     },
+    "retry_button_label": {
+      "allOf": [
+        {"$ref": "#/definitions/plainText"},
+        {"description": "Text for the button in the event of a submission error/failure."}
+      ],
+      "default": "Try again"
+    },
     "do_not_autoblock": {
       "type": "boolean",
       "description": "Used to prevent blocking the snippet after the CTA (link or button) has been clicked"
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/Trailhead/Trailhead.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/Trailhead/Trailhead.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/asrouter/templates/Trailhead/Trailhead.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/asrouter/templates/Trailhead/Trailhead.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -112,7 +112,7 @@
    * Report to telemetry additional information about the form submission.
    */
   _getFormInfo() {
-    const value = { has_flow_params: this.props.flowParams.flowId.length > 0 };
+    const value = { has_flow_params: !!this.props.flowParams.flowId.length };
     return { value };
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/components/DiscoveryStreamBase/DiscoveryStreamBase.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -335,7 +335,7 @@
               components: [topSites],
             },
           ])}
-        {layoutRender.length > 0 && (
+        {!!layoutRender.length && (
           <CollapsibleSection
             className="ds-layout"
             collapsed={topStories.pref.collapsed}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSCard/DSCard.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -76,7 +76,7 @@
 
     this.onLinkClick = this.onLinkClick.bind(this);
     this.setPlaceholderRef = element => {
-      this.placholderElement = element;
+      this.placeholderElement = element;
     };
 
     this.state = {
@@ -117,8 +117,8 @@
       const entry = entries.find(e => e.isIntersecting);
 
       if (entry) {
-        if (this.placholderElement) {
-          this.observer.unobserve(this.placholderElement);
+        if (this.placeholderElement) {
+          this.observer.unobserve(this.placeholderElement);
         }
 
         // Stop observing since element has been seen
@@ -131,8 +131,8 @@
 
   onIdleCallback() {
     if (!this.state.isSeen) {
-      if (this.observer && this.placholderElement) {
-        this.observer.unobserve(this.placholderElement);
+      if (this.observer && this.placeholderElement) {
+        this.observer.unobserve(this.placeholderElement);
       }
       this.setState({
         isSeen: true,
@@ -141,19 +141,22 @@
   }
 
   componentDidMount() {
-    this.idleCallbackId = window.requestIdleCallback(
+    this.idleCallbackId = this.props.windowObj.requestIdleCallback(
       this.onIdleCallback.bind(this)
     );
-    if (this.placholderElement) {
+    if (this.placeholderElement) {
       this.observer = new IntersectionObserver(this.onSeen.bind(this));
-      this.observer.observe(this.placholderElement);
+      this.observer.observe(this.placeholderElement);
     }
   }
 
   componentWillUnmount() {
     // Remove observer on unmount
-    if (this.observer && this.placholderElement) {
-      this.observer.unobserve(this.placholderElement);
+    if (this.observer && this.placeholderElement) {
+      this.observer.unobserve(this.placeholderElement);
+    }
+    if (this.idleCallbackId) {
+      this.props.windowObj.cancelIdleCallback(this.idleCallbackId);
     }
   }
 
@@ -234,4 +237,9 @@
     );
   }
 }
+
+DSCard.defaultProps = {
+  windowObj: window, // Added to support unit tests
+};
+
 export const PlaceholderDSCard = props => <DSCard placeholder={true} />;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/components/DiscoveryStreamComponents/DSLinkMenu/DSLinkMenu.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -9,7 +9,6 @@
 export class DSLinkMenu extends React.PureComponent {
   constructor(props) {
     super(props);
-    this.windowObj = this.props.windowObj || window; // Added to support unit tests
     this.onMenuUpdate = this.onMenuUpdate.bind(this);
     this.onMenuShow = this.onMenuShow.bind(this);
     this.contextMenuButtonRef = React.createRef();
@@ -23,14 +22,16 @@
   }
 
   nextAnimationFrame() {
-    return new Promise(resolve => requestAnimationFrame(resolve));
+    return new Promise(resolve =>
+      this.props.windowObj.requestAnimationFrame(resolve)
+    );
   }
 
   async onMenuShow() {
     const dsLinkMenuHostDiv = this.contextMenuButtonRef.current.parentElement;
     // Wait for next frame before computing scrollMaxX to allow fluent menu strings to be visible
     await this.nextAnimationFrame();
-    if (this.windowObj.scrollMaxX > 0) {
+    if (this.props.windowObj.scrollMaxX > 0) {
       dsLinkMenuHostDiv.parentElement.classList.add("last-item");
     }
     dsLinkMenuHostDiv.parentElement.classList.add("active");
@@ -81,3 +82,7 @@
     );
   }
 }
+
+DSLinkMenu.defaultProps = {
+  windowObj: window, // Added to support unit tests
+};
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/components/Sections/Sections.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/components/Sections/Sections.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/content-src/components/Sections/Sections.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/content-src/components/Sections/Sections.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -200,7 +200,7 @@
     const isPocketLoggedInDefined =
       isUserLoggedIn === true || isUserLoggedIn === false;
 
-    const hasTopics = topics && topics.length > 0;
+    const hasTopics = topics && !!topics.length;
 
     const shouldShowPocketCta =
       id === "topstories" && useCta && isUserLoggedIn === false;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/data/content/activity-stream.bundle.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/data/content/activity-stream.bundle.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/data/content/activity-stream.bundle.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/data/content/activity-stream.bundle.js	2019-09-15 11:33:06.000000000 +0000
@@ -202,7 +202,7 @@
 
 const ASRouterActions = {};
 
-for (const type of ["INSTALL_ADDON_FROM_URL", "OPEN_APPLICATIONS_MENU", "OPEN_PRIVATE_BROWSER_WINDOW", "OPEN_URL", "OPEN_ABOUT_PAGE", "OPEN_PREFERENCES_PAGE", "SHOW_FIREFOX_ACCOUNTS", "PIN_CURRENT_TAB", "ENABLE_FIREFOX_MONITOR"]) {
+for (const type of ["INSTALL_ADDON_FROM_URL", "OPEN_APPLICATIONS_MENU", "OPEN_PRIVATE_BROWSER_WINDOW", "OPEN_URL", "OPEN_ABOUT_PAGE", "OPEN_PREFERENCES_PAGE", "SHOW_FIREFOX_ACCOUNTS", "PIN_CURRENT_TAB", "ENABLE_FIREFOX_MONITOR", "OPEN_PROTECTION_PANEL"]) {
   ASRouterActions[type] = type;
 } // Helper function for creating routed actions between content and main
 // Not intended to be used by consumers
@@ -2690,19 +2690,19 @@
 /* 17 */
 /***/ (function(module) {
 
-module.exports = {"title":"FXASignupSnippet","description":"A snippet template for FxA sign up/sign in","version":"1.1.0","type":"object","definitions":{"plainText":{"description":"Plain text (no HTML allowed)","type":"string"},"richText":{"description":"Text with HTML subset allowed: i, b, u, strong, em, br","type":"string"},"link_url":{"description":"Target for links or buttons","type":"string","format":"uri"}},"properties":{"scene1_title":{"allof":[{"$ref":"#/definitions/plainText"},{"description":"snippet title displayed before snippet text"}]},"scene1_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene2_title":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Title displayed before text in scene 2. Should be plain text."}]},"scene2_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene1_icon":{"type":"string","description":"Snippet icon. 64x64px. SVG or PNG preferred."},"scene1_icon_dark_theme":{"type":"string","description":"Snippet icon. Dark theme variant. 64x64px. SVG or PNG preferred."},"scene1_title_icon":{"type":"string","description":"Small icon that shows up before the title / text. 16x16px. SVG or PNG preferred. Grayscale."},"scene1_title_icon_dark_theme":{"type":"string","description":"Small icon that shows up before the title / text. Dark theme variant. 16x16px. SVG or PNG preferred. Grayscale."},"scene2_email_placeholder_text":{"type":"string","description":"Value to show while input is empty.","default":"Your email here"},"scene2_button_label":{"type":"string","description":"Label for form submit button","default":"Sign me up"},"scene2_dismiss_button_text":{"type":"string","description":"Label for the dismiss button when the sign-up form is expanded.","default":"Dismiss"},"hidden_inputs":{"type":"object","description":"Each entry represents a hidden input, key is used as value for the name property.","properties":{"action":{"type":"string","enum":["email"]},"context":{"type":"string","enum":["fx_desktop_v3"]},"entrypoint":{"type":"string","enum":["snippets"]},"service":{"type":"string","enum":["sync"]},"utm_content":{"type":"number","description":"Firefox version number"},"utm_source":{"type":"string","enum":["snippet"]},"utm_campaign":{"type":"string","description":"(fxa) Value to pass through to GA as utm_campaign."},"utm_term":{"type":"string","description":"(fxa) Value to pass through to GA as utm_term."},"additionalProperties":false}},"scene1_button_label":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Text for a button next to main snippet text that links to button_url. Requires button_url."}],"default":"Learn more"},"scene1_button_color":{"type":"string","description":"The text color of the button. Valid CSS color."},"scene1_button_background_color":{"type":"string","description":"The background color of the button. Valid CSS color."},"do_not_autoblock":{"type":"boolean","description":"Used to prevent blocking the snippet after the CTA (link or button) has been clicked","default":false},"utm_campaign":{"type":"string","description":"(fxa) Value to pass through to GA as utm_campaign."},"utm_term":{"type":"string","description":"(fxa) Value to pass through to GA as utm_term."},"links":{"additionalProperties":{"url":{"allOf":[{"$ref":"#/definitions/link_url"},{"description":"The url where the link points to."}]},"metric":{"type":"string","description":"Custom event name sent with telemetry event."}}}},"additionalProperties":false,"required":["scene1_text","scene2_text","scene1_button_label"],"dependencies":{"scene1_button_color":["scene1_button_label"],"scene1_button_background_color":["scene1_button_label"]}};
+module.exports = {"title":"FXASignupSnippet","description":"A snippet template for FxA sign up/sign in","version":"1.1.0","type":"object","definitions":{"plainText":{"description":"Plain text (no HTML allowed)","type":"string"},"richText":{"description":"Text with HTML subset allowed: i, b, u, strong, em, br","type":"string"},"link_url":{"description":"Target for links or buttons","type":"string","format":"uri"}},"properties":{"scene1_title":{"allof":[{"$ref":"#/definitions/plainText"},{"description":"snippet title displayed before snippet text"}]},"scene1_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene2_title":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Title displayed before text in scene 2. Should be plain text."}]},"scene2_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene1_icon":{"type":"string","description":"Snippet icon. 64x64px. SVG or PNG preferred."},"scene1_icon_dark_theme":{"type":"string","description":"Snippet icon. Dark theme variant. 64x64px. SVG or PNG preferred."},"scene1_title_icon":{"type":"string","description":"Small icon that shows up before the title / text. 16x16px. SVG or PNG preferred. Grayscale."},"scene1_title_icon_dark_theme":{"type":"string","description":"Small icon that shows up before the title / text. Dark theme variant. 16x16px. SVG or PNG preferred. Grayscale."},"scene2_email_placeholder_text":{"type":"string","description":"Value to show while input is empty.","default":"Your email here"},"scene2_button_label":{"type":"string","description":"Label for form submit button","default":"Sign me up"},"scene2_dismiss_button_text":{"type":"string","description":"Label for the dismiss button when the sign-up form is expanded.","default":"Dismiss"},"hidden_inputs":{"type":"object","description":"Each entry represents a hidden input, key is used as value for the name property.","properties":{"action":{"type":"string","enum":["email"]},"context":{"type":"string","enum":["fx_desktop_v3"]},"entrypoint":{"type":"string","enum":["snippets"]},"service":{"type":"string","enum":["sync"]},"utm_content":{"type":"number","description":"Firefox version number"},"utm_source":{"type":"string","enum":["snippet"]},"utm_campaign":{"type":"string","description":"(fxa) Value to pass through to GA as utm_campaign."},"utm_term":{"type":"string","description":"(fxa) Value to pass through to GA as utm_term."},"additionalProperties":false}},"scene1_button_label":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Text for a button next to main snippet text that links to button_url. Requires button_url."}],"default":"Learn more"},"scene1_button_color":{"type":"string","description":"The text color of the button. Valid CSS color."},"scene1_button_background_color":{"type":"string","description":"The background color of the button. Valid CSS color."},"retry_button_label":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Text for the button in the event of a submission error/failure."}],"default":"Try again"},"do_not_autoblock":{"type":"boolean","description":"Used to prevent blocking the snippet after the CTA (link or button) has been clicked","default":false},"utm_campaign":{"type":"string","description":"(fxa) Value to pass through to GA as utm_campaign."},"utm_term":{"type":"string","description":"(fxa) Value to pass through to GA as utm_term."},"links":{"additionalProperties":{"url":{"allOf":[{"$ref":"#/definitions/link_url"},{"description":"The url where the link points to."}]},"metric":{"type":"string","description":"Custom event name sent with telemetry event."}}}},"additionalProperties":false,"required":["scene1_text","scene2_text","scene1_button_label"],"dependencies":{"scene1_button_color":["scene1_button_label"],"scene1_button_background_color":["scene1_button_label"]}};
 
 /***/ }),
 /* 18 */
 /***/ (function(module) {
 
-module.exports = {"title":"NewsletterSnippet","description":"A snippet template for send to device mobile download","version":"1.1.0","type":"object","definitions":{"plainText":{"description":"Plain text (no HTML allowed)","type":"string"},"richText":{"description":"Text with HTML subset allowed: i, b, u, strong, em, br","type":"string"},"link_url":{"description":"Target for links or buttons","type":"string","format":"uri"}},"properties":{"locale":{"type":"string","description":"Two to five character string for the locale code","default":"en-US"},"scene1_title":{"allof":[{"$ref":"#/definitions/plainText"},{"description":"snippet title displayed before snippet text"}]},"scene1_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene2_title":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Title displayed before text in scene 2. Should be plain text."}]},"scene2_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene1_icon":{"type":"string","description":"Snippet icon. 64x64px. SVG or PNG preferred."},"scene1_icon_dark_theme":{"type":"string","description":"Snippet icon. Dark theme variant. 64x64px. SVG or PNG preferred."},"scene1_title_icon":{"type":"string","description":"Small icon that shows up before the title / text. 16x16px. SVG or PNG preferred. Grayscale."},"scene1_title_icon_dark_theme":{"type":"string","description":"Small icon that shows up before the title / text. Dark theme variant. 16x16px. SVG or PNG preferred. Grayscale."},"scene2_email_placeholder_text":{"type":"string","description":"Value to show while input is empty.","default":"Your email here"},"scene2_button_label":{"type":"string","description":"Label for form submit button","default":"Sign me up"},"scene2_privacy_html":{"type":"string","description":"(send to device) Html for disclaimer and link underneath input box."},"scene2_dismiss_button_text":{"type":"string","description":"Label for the dismiss button when the sign-up form is expanded.","default":"Dismiss"},"hidden_inputs":{"type":"object","description":"Each entry represents a hidden input, key is used as value for the name property.","properties":{"fmt":{"type":"string","description":"","default":"H"}}},"scene1_button_label":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Text for a button next to main snippet text that links to button_url. Requires button_url."}],"default":"Learn more"},"scene1_button_color":{"type":"string","description":"The text color of the button. Valid CSS color."},"scene1_button_background_color":{"type":"string","description":"The background color of the button. Valid CSS color."},"do_not_autoblock":{"type":"boolean","description":"Used to prevent blocking the snippet after the CTA (link or button) has been clicked","default":false},"success_text":{"type":"string","description":"Message shown on successful registration."},"error_text":{"type":"string","description":"Message shown if registration failed."},"scene2_newsletter":{"type":"string","description":"Newsletter/basket id user is subscribing to.","default":"mozilla-foundation"},"links":{"additionalProperties":{"url":{"allOf":[{"$ref":"#/definitions/link_url"},{"description":"The url where the link points to."}]},"metric":{"type":"string","description":"Custom event name sent with telemetry event."}}}},"additionalProperties":false,"required":["scene1_text","scene2_text","scene1_button_label"],"dependencies":{"scene1_button_color":["scene1_button_label"],"scene1_button_background_color":["scene1_button_label"]}};
+module.exports = {"title":"NewsletterSnippet","description":"A snippet template for send to device mobile download","version":"1.1.0","type":"object","definitions":{"plainText":{"description":"Plain text (no HTML allowed)","type":"string"},"richText":{"description":"Text with HTML subset allowed: i, b, u, strong, em, br","type":"string"},"link_url":{"description":"Target for links or buttons","type":"string","format":"uri"}},"properties":{"locale":{"type":"string","description":"Two to five character string for the locale code","default":"en-US"},"scene1_title":{"allof":[{"$ref":"#/definitions/plainText"},{"description":"snippet title displayed before snippet text"}]},"scene1_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene2_title":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Title displayed before text in scene 2. Should be plain text."}]},"scene2_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene1_icon":{"type":"string","description":"Snippet icon. 64x64px. SVG or PNG preferred."},"scene1_icon_dark_theme":{"type":"string","description":"Snippet icon. Dark theme variant. 64x64px. SVG or PNG preferred."},"scene1_title_icon":{"type":"string","description":"Small icon that shows up before the title / text. 16x16px. SVG or PNG preferred. Grayscale."},"scene1_title_icon_dark_theme":{"type":"string","description":"Small icon that shows up before the title / text. Dark theme variant. 16x16px. SVG or PNG preferred. Grayscale."},"scene2_email_placeholder_text":{"type":"string","description":"Value to show while input is empty.","default":"Your email here"},"scene2_button_label":{"type":"string","description":"Label for form submit button","default":"Sign me up"},"scene2_privacy_html":{"type":"string","description":"(send to device) Html for disclaimer and link underneath input box."},"scene2_dismiss_button_text":{"type":"string","description":"Label for the dismiss button when the sign-up form is expanded.","default":"Dismiss"},"hidden_inputs":{"type":"object","description":"Each entry represents a hidden input, key is used as value for the name property.","properties":{"fmt":{"type":"string","description":"","default":"H"}}},"scene1_button_label":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Text for a button next to main snippet text that links to button_url. Requires button_url."}],"default":"Learn more"},"scene1_button_color":{"type":"string","description":"The text color of the button. Valid CSS color."},"scene1_button_background_color":{"type":"string","description":"The background color of the button. Valid CSS color."},"retry_button_label":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Text for the button in the event of a submission error/failure."}],"default":"Try again"},"do_not_autoblock":{"type":"boolean","description":"Used to prevent blocking the snippet after the CTA (link or button) has been clicked","default":false},"success_text":{"type":"string","description":"Message shown on successful registration."},"error_text":{"type":"string","description":"Message shown if registration failed."},"scene2_newsletter":{"type":"string","description":"Newsletter/basket id user is subscribing to.","default":"mozilla-foundation"},"links":{"additionalProperties":{"url":{"allOf":[{"$ref":"#/definitions/link_url"},{"description":"The url where the link points to."}]},"metric":{"type":"string","description":"Custom event name sent with telemetry event."}}}},"additionalProperties":false,"required":["scene1_text","scene2_text","scene1_button_label"],"dependencies":{"scene1_button_color":["scene1_button_label"],"scene1_button_background_color":["scene1_button_label"]}};
 
 /***/ }),
 /* 19 */
 /***/ (function(module) {
 
-module.exports = {"title":"SendToDeviceSnippet","description":"A snippet template for send to device mobile download","version":"1.1.0","type":"object","definitions":{"plainText":{"description":"Plain text (no HTML allowed)","type":"string"},"richText":{"description":"Text with HTML subset allowed: i, b, u, strong, em, br","type":"string"},"link_url":{"description":"Target for links or buttons","type":"string","format":"uri"}},"properties":{"locale":{"type":"string","description":"Two to five character string for the locale code","default":"en-US"},"country":{"type":"string","description":"Two character string for the country code (used for SMS)","default":"us"},"scene1_title":{"allof":[{"$ref":"#/definitions/plainText"},{"description":"snippet title displayed before snippet text"}]},"scene1_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene2_title":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Title displayed before text in scene 2. Should be plain text."}]},"scene2_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene1_icon":{"type":"string","description":"Snippet icon. 64x64px. SVG or PNG preferred."},"scene1_icon_dark_theme":{"type":"string","description":"Snippet icon. Dark theme variant. 64x64px. SVG or PNG preferred."},"scene2_icon":{"type":"string","description":"(send to device) Image to display above the form. Dark theme variant. 98x98px. SVG or PNG preferred."},"scene2_icon_dark_theme":{"type":"string","description":"(send to device) Image to display above the form. 98x98px. SVG or PNG preferred."},"scene1_title_icon":{"type":"string","description":"Small icon that shows up before the title / text. 16x16px. SVG or PNG preferred. Grayscale."},"scene1_title_icon_dark_theme":{"type":"string","description":"Small icon that shows up before the title / text. Dark theme variant. 16x16px. SVG or PNG preferred. Grayscale."},"scene2_button_label":{"type":"string","description":"Label for form submit button","default":"Send"},"scene2_input_placeholder":{"type":"string","description":"(send to device) Value to show while input is empty.","default":"Your email here"},"scene2_disclaimer_html":{"type":"string","description":"(send to device) Html for disclaimer and link underneath input box."},"scene2_dismiss_button_text":{"type":"string","description":"Label for the dismiss button when the sign-up form is expanded.","default":"Dismiss"},"hidden_inputs":{"type":"object","description":"Each entry represents a hidden input, key is used as value for the name property.","properties":{"action":{"type":"string","enum":["email"]},"context":{"type":"string","enum":["fx_desktop_v3"]},"entrypoint":{"type":"string","enum":["snippets"]},"service":{"type":"string","enum":["sync"]},"utm_content":{"type":"string","description":"Firefox version number"},"utm_source":{"type":"string","enum":["snippet"]},"utm_campaign":{"type":"string","description":"(fxa) Value to pass through to GA as utm_campaign."},"utm_term":{"type":"string","description":"(fxa) Value to pass through to GA as utm_term."},"additionalProperties":false}},"scene1_button_label":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Text for a button next to main snippet text that links to button_url. Requires button_url."}],"default":"Learn more"},"scene1_button_color":{"type":"string","description":"The text color of the button. Valid CSS color."},"scene1_button_background_color":{"type":"string","description":"The background color of the button. Valid CSS color."},"do_not_autoblock":{"type":"boolean","description":"Used to prevent blocking the snippet after the CTA (link or button) has been clicked","default":false},"success_title":{"type":"string","description":"(send to device) Title shown before text on successful registration."},"success_text":{"type":"string","description":"Message shown on successful registration."},"error_text":{"type":"string","description":"Message shown if registration failed."},"include_sms":{"type":"boolean","description":"(send to device) Allow users to send an SMS message with the form?","default":false},"message_id_sms":{"type":"string","description":"(send to device) Newsletter/basket id representing the SMS message to be sent."},"message_id_email":{"type":"string","description":"(send to device) Newsletter/basket id representing the email message to be sent. Must be a value from the 'Slug' column here: https://basket.mozilla.org/news/."},"utm_campaign":{"type":"string","description":"(fxa) Value to pass through to GA as utm_campaign."},"utm_term":{"type":"string","description":"(fxa) Value to pass through to GA as utm_term."},"links":{"additionalProperties":{"url":{"allOf":[{"$ref":"#/definitions/link_url"},{"description":"The url where the link points to."}]},"metric":{"type":"string","description":"Custom event name sent with telemetry event."}}}},"additionalProperties":false,"required":["scene1_text","scene2_text","scene1_button_label"],"dependencies":{"scene1_button_color":["scene1_button_label"],"scene1_button_background_color":["scene1_button_label"]}};
+module.exports = {"title":"SendToDeviceSnippet","description":"A snippet template for send to device mobile download","version":"1.1.0","type":"object","definitions":{"plainText":{"description":"Plain text (no HTML allowed)","type":"string"},"richText":{"description":"Text with HTML subset allowed: i, b, u, strong, em, br","type":"string"},"link_url":{"description":"Target for links or buttons","type":"string","format":"uri"}},"properties":{"locale":{"type":"string","description":"Two to five character string for the locale code","default":"en-US"},"country":{"type":"string","description":"Two character string for the country code (used for SMS)","default":"us"},"scene1_title":{"allof":[{"$ref":"#/definitions/plainText"},{"description":"snippet title displayed before snippet text"}]},"scene1_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene2_title":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Title displayed before text in scene 2. Should be plain text."}]},"scene2_text":{"allOf":[{"$ref":"#/definitions/richText"},{"description":"Main body text of snippet. HTML subset allowed: i, b, u, strong, em, br"}]},"scene1_icon":{"type":"string","description":"Snippet icon. 64x64px. SVG or PNG preferred."},"scene1_icon_dark_theme":{"type":"string","description":"Snippet icon. Dark theme variant. 64x64px. SVG or PNG preferred."},"scene2_icon":{"type":"string","description":"(send to device) Image to display above the form. Dark theme variant. 98x98px. SVG or PNG preferred."},"scene2_icon_dark_theme":{"type":"string","description":"(send to device) Image to display above the form. 98x98px. SVG or PNG preferred."},"scene1_title_icon":{"type":"string","description":"Small icon that shows up before the title / text. 16x16px. SVG or PNG preferred. Grayscale."},"scene1_title_icon_dark_theme":{"type":"string","description":"Small icon that shows up before the title / text. Dark theme variant. 16x16px. SVG or PNG preferred. Grayscale."},"scene2_button_label":{"type":"string","description":"Label for form submit button","default":"Send"},"scene2_input_placeholder":{"type":"string","description":"(send to device) Value to show while input is empty.","default":"Your email here"},"scene2_disclaimer_html":{"type":"string","description":"(send to device) Html for disclaimer and link underneath input box."},"scene2_dismiss_button_text":{"type":"string","description":"Label for the dismiss button when the sign-up form is expanded.","default":"Dismiss"},"hidden_inputs":{"type":"object","description":"Each entry represents a hidden input, key is used as value for the name property.","properties":{"action":{"type":"string","enum":["email"]},"context":{"type":"string","enum":["fx_desktop_v3"]},"entrypoint":{"type":"string","enum":["snippets"]},"service":{"type":"string","enum":["sync"]},"utm_content":{"type":"string","description":"Firefox version number"},"utm_source":{"type":"string","enum":["snippet"]},"utm_campaign":{"type":"string","description":"(fxa) Value to pass through to GA as utm_campaign."},"utm_term":{"type":"string","description":"(fxa) Value to pass through to GA as utm_term."},"additionalProperties":false}},"scene1_button_label":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Text for a button next to main snippet text that links to button_url. Requires button_url."}],"default":"Learn more"},"scene1_button_color":{"type":"string","description":"The text color of the button. Valid CSS color."},"scene1_button_background_color":{"type":"string","description":"The background color of the button. Valid CSS color."},"retry_button_label":{"allOf":[{"$ref":"#/definitions/plainText"},{"description":"Text for the button in the event of a submission error/failure."}],"default":"Try again"},"do_not_autoblock":{"type":"boolean","description":"Used to prevent blocking the snippet after the CTA (link or button) has been clicked","default":false},"success_title":{"type":"string","description":"(send to device) Title shown before text on successful registration."},"success_text":{"type":"string","description":"Message shown on successful registration."},"error_text":{"type":"string","description":"Message shown if registration failed."},"include_sms":{"type":"boolean","description":"(send to device) Allow users to send an SMS message with the form?","default":false},"message_id_sms":{"type":"string","description":"(send to device) Newsletter/basket id representing the SMS message to be sent."},"message_id_email":{"type":"string","description":"(send to device) Newsletter/basket id representing the email message to be sent. Must be a value from the 'Slug' column here: https://basket.mozilla.org/news/."},"utm_campaign":{"type":"string","description":"(fxa) Value to pass through to GA as utm_campaign."},"utm_term":{"type":"string","description":"(fxa) Value to pass through to GA as utm_term."},"links":{"additionalProperties":{"url":{"allOf":[{"$ref":"#/definitions/link_url"},{"description":"The url where the link points to."}]},"metric":{"type":"string","description":"Custom event name sent with telemetry event."}}}},"additionalProperties":false,"required":["scene1_text","scene2_text","scene1_button_label"],"dependencies":{"scene1_button_color":["scene1_button_label"],"scene1_button_background_color":["scene1_button_label"]}};
 
 /***/ }),
 /* 20 */
@@ -8166,8 +8166,6 @@
 class DSLinkMenu_DSLinkMenu extends external_React_default.a.PureComponent {
   constructor(props) {
     super(props);
-    this.windowObj = this.props.windowObj || window; // Added to support unit tests
-
     this.onMenuUpdate = this.onMenuUpdate.bind(this);
     this.onMenuShow = this.onMenuShow.bind(this);
     this.contextMenuButtonRef = external_React_default.a.createRef();
@@ -8181,7 +8179,7 @@
   }
 
   nextAnimationFrame() {
-    return new Promise(resolve => requestAnimationFrame(resolve));
+    return new Promise(resolve => this.props.windowObj.requestAnimationFrame(resolve));
   }
 
   async onMenuShow() {
@@ -8189,7 +8187,7 @@
 
     await this.nextAnimationFrame();
 
-    if (this.windowObj.scrollMaxX > 0) {
+    if (this.props.windowObj.scrollMaxX > 0) {
       dsLinkMenuHostDiv.parentElement.classList.add("last-item");
     }
 
@@ -8232,6 +8230,10 @@
   }
 
 }
+DSLinkMenu_DSLinkMenu.defaultProps = {
+  windowObj: window // Added to support unit tests
+
+};
 // EXTERNAL MODULE: ./content-src/components/DiscoveryStreamImpressionStats/ImpressionStats.jsx
 var ImpressionStats = __webpack_require__(34);
 
@@ -8443,7 +8445,7 @@
     this.onLinkClick = this.onLinkClick.bind(this);
 
     this.setPlaceholderRef = element => {
-      this.placholderElement = element;
+      this.placeholderElement = element;
     };
 
     this.state = {
@@ -8477,8 +8479,8 @@
       const entry = entries.find(e => e.isIntersecting);
 
       if (entry) {
-        if (this.placholderElement) {
-          this.observer.unobserve(this.placholderElement);
+        if (this.placeholderElement) {
+          this.observer.unobserve(this.placeholderElement);
         } // Stop observing since element has been seen
 
 
@@ -8491,8 +8493,8 @@
 
   onIdleCallback() {
     if (!this.state.isSeen) {
-      if (this.observer && this.placholderElement) {
-        this.observer.unobserve(this.placholderElement);
+      if (this.observer && this.placeholderElement) {
+        this.observer.unobserve(this.placeholderElement);
       }
 
       this.setState({
@@ -8502,18 +8504,22 @@
   }
 
   componentDidMount() {
-    this.idleCallbackId = window.requestIdleCallback(this.onIdleCallback.bind(this));
+    this.idleCallbackId = this.props.windowObj.requestIdleCallback(this.onIdleCallback.bind(this));
 
-    if (this.placholderElement) {
+    if (this.placeholderElement) {
       this.observer = new IntersectionObserver(this.onSeen.bind(this));
-      this.observer.observe(this.placholderElement);
+      this.observer.observe(this.placeholderElement);
     }
   }
 
   componentWillUnmount() {
     // Remove observer on unmount
-    if (this.observer && this.placholderElement) {
-      this.observer.unobserve(this.placholderElement);
+    if (this.observer && this.placeholderElement) {
+      this.observer.unobserve(this.placeholderElement);
+    }
+
+    if (this.idleCallbackId) {
+      this.props.windowObj.cancelIdleCallback(this.idleCallbackId);
     }
   }
 
@@ -8583,6 +8589,10 @@
   }
 
 }
+DSCard_DSCard.defaultProps = {
+  windowObj: window // Added to support unit tests
+
+};
 const PlaceholderDSCard = props => external_React_default.a.createElement(DSCard_DSCard, {
   placeholder: true
 });
@@ -11656,7 +11666,7 @@
     } : {
       error_text: content.error_text
     };
-    const retryButtonText = content.scene1_button_label;
+    const retryButtonText = content.retry_button_label;
     return external_React_default.a.createElement(SnippetBase_SnippetBase, this.props, external_React_default.a.createElement("div", {
       className: "submissionStatus"
     }, successTitle ? external_React_default.a.createElement("h2", {
@@ -11769,6 +11779,7 @@
   const firefox_version = userAgent ? parseInt(userAgent[1], 10) : 0;
   const extendedContent = {
     scene1_button_label: FXASignupSnippet_schema.properties.scene1_button_label.default,
+    retry_button_label: FXASignupSnippet_schema.properties.retry_button_label.default,
     scene2_email_placeholder_text: FXASignupSnippet_schema.properties.scene2_email_placeholder_text.default,
     scene2_button_label: FXASignupSnippet_schema.properties.scene2_button_label.default,
     scene2_dismiss_button_text: FXASignupSnippet_schema.properties.scene2_dismiss_button_text.default,
@@ -11806,6 +11817,7 @@
 const NewsletterSnippet = props => {
   const extendedContent = {
     scene1_button_label: NewsletterSnippet_schema.properties.scene1_button_label.default,
+    retry_button_label: NewsletterSnippet_schema.properties.retry_button_label.default,
     scene2_email_placeholder_text: NewsletterSnippet_schema.properties.scene2_email_placeholder_text.default,
     scene2_button_label: NewsletterSnippet_schema.properties.scene2_button_label.default,
     scene2_dismiss_button_text: NewsletterSnippet_schema.properties.scene2_dismiss_button_text.default,
@@ -11921,6 +11933,7 @@
   return { ...props,
     content: {
       scene1_button_label: SendToDeviceSnippet_schema.properties.scene1_button_label.default,
+      retry_button_label: SendToDeviceSnippet_schema.properties.retry_button_label.default,
       scene2_dismiss_button_text: SendToDeviceSnippet_schema.properties.scene2_dismiss_button_text.default,
       scene2_button_label: SendToDeviceSnippet_schema.properties.scene2_button_label.default,
       scene2_input_placeholder: SendToDeviceSnippet_schema.properties.scene2_input_placeholder.default,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ActivityStream.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ActivityStream.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ActivityStream.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ActivityStream.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -720,11 +720,25 @@
 
     // Update the pref config of those with dynamic values
     for (const pref of PREFS_CONFIG.keys()) {
+      // Only need to process dynamic prefs
       const prefConfig = PREFS_CONFIG.get(pref);
       if (!prefConfig.getValue) {
         continue;
       }
 
+      // Have the dynamic pref just reuse using existing default, e.g., those
+      // set via Autoconfig or policy
+      try {
+        const existingDefault = this._defaultPrefs.get(pref);
+        if (existingDefault !== undefined && prefConfig.value === undefined) {
+          prefConfig.getValue = () => existingDefault;
+        }
+      } catch (ex) {
+        // We get NS_ERROR_UNEXPECTED for prefs that have a user value (causing
+        // default branch to believe there's a type) but no actual default value
+      }
+
+      // Compute the dynamic value (potentially generic based on dummy geo)
       const newValue = prefConfig.getValue({
         geo: this.geo,
         locale: this.locale,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ASRouter.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ASRouter.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ASRouter.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ASRouter.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -20,12 +20,26 @@
   PanelTestProvider: "resource://activity-stream/lib/PanelTestProvider.jsm",
   ToolbarBadgeHub: "resource://activity-stream/lib/ToolbarBadgeHub.jsm",
   ToolbarPanelHub: "resource://activity-stream/lib/ToolbarPanelHub.jsm",
+  ASRouterTargeting: "resource://activity-stream/lib/ASRouterTargeting.jsm",
+  QueryCache: "resource://activity-stream/lib/ASRouterTargeting.jsm",
+  ASRouterPreferences: "resource://activity-stream/lib/ASRouterPreferences.jsm",
+  TARGETING_PREFERENCES:
+    "resource://activity-stream/lib/ASRouterPreferences.jsm",
+  ASRouterTriggerListeners:
+    "resource://activity-stream/lib/ASRouterTriggerListeners.jsm",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
+  ClientEnvironment: "resource://normandy/lib/ClientEnvironment.jsm",
+  Sampling: "resource://gre/modules/components-utils/Sampling.jsm",
+  CFRMessageProvider: "resource://activity-stream/lib/CFRMessageProvider.jsm",
+  KintoHttpClient: "resource://services-common/kinto-http-client.js",
+  Downloader: "resource://services-settings/Attachments.jsm",
 });
 const {
   ASRouterActions: ra,
   actionTypes: at,
   actionCreators: ac,
 } = ChromeUtils.import("resource://activity-stream/common/Actions.jsm");
+
 const { CFRMessageProvider } = ChromeUtils.import(
   "resource://activity-stream/lib/CFRMessageProvider.jsm"
 );
@@ -42,47 +56,6 @@
   "resource:///modules/AttributionCode.jsm"
 );
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "ASRouterPreferences",
-  "resource://activity-stream/lib/ASRouterPreferences.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "TARGETING_PREFERENCES",
-  "resource://activity-stream/lib/ASRouterPreferences.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "ASRouterTargeting",
-  "resource://activity-stream/lib/ASRouterTargeting.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "QueryCache",
-  "resource://activity-stream/lib/ASRouterTargeting.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "ASRouterTriggerListeners",
-  "resource://activity-stream/lib/ASRouterTriggerListeners.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "TelemetryEnvironment",
-  "resource://gre/modules/TelemetryEnvironment.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "ClientEnvironment",
-  "resource://normandy/lib/ClientEnvironment.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "Sampling",
-  "resource://gre/modules/components-utils/Sampling.jsm"
-);
-
 const TRAILHEAD_CONFIG = {
   OVERRIDE_PREF: "trailhead.firstrun.branches",
   DID_SEE_ABOUT_WELCOME_PREF: "trailhead.firstrun.didSeeAboutWelcome",
@@ -121,6 +94,18 @@
 };
 const STARTPAGE_VERSION = "6";
 
+// Remote Settings
+const RS_SERVER_PREF = "services.settings.server";
+const RS_MAIN_BUCKET = "main";
+const RS_COLLECTION_L10N = "ms-language-packs"; // "ms" stands for Messaging System
+const RS_PROVIDERS_WITH_L10N = ["cfr", "cfr-fxa"];
+const RS_FLUENT_VERSION = "v1";
+const RS_FLUENT_RECORD_PREFIX = `cfr-${RS_FLUENT_VERSION}`;
+const RS_DOWNLOAD_MAX_RETRIES = 2;
+
+// To observe the app locale change notification.
+const TOPIC_INTL_LOCALE_CHANGED = "intl:app-locales-changed";
+
 /**
  * chooseBranch<T> -  Choose an item from a list of "branches" pseudorandomly using a seed / ratio configuration
  * @param seed {string} A unique seed for the randomizer
@@ -275,6 +260,17 @@
   /**
    * _remoteSettingsLoader - Loads messages for a RemoteSettings provider
    *
+   * Note:
+   * 1). Both "cfr" and "cfr-fxa" require the Fluent file for l10n, so there is
+   * another file downloading phase for those two providers after their messages
+   * are successfully fetched from Remote Settings. Currently, they share the same
+   * attachment of the record "${RS_FLUENT_RECORD_PREFIX}-${locale}" in the
+   * "ms-language-packs" collection. E.g. for "en-US" with version "v1",
+   * the Fluent file is attched to the record with ID "cfr-v1-en-US".
+   *
+   * 2). The Remote Settings downloader is able to detect the duplicate download
+   * requests for the same attachment and ignore the redundent requests automatically.
+   *
    * @param {obj} provider An AS router provider
    * @param {string} provider.id The id of the provider
    * @param {string} provider.bucket The name of the Remote Settings bucket
@@ -294,6 +290,32 @@
             provider.id,
             options.dispatchToAS
           );
+        } else if (RS_PROVIDERS_WITH_L10N.includes(provider.id)) {
+          const locale = Services.locale.appLocaleAsLangTag;
+          const recordId = `${RS_FLUENT_RECORD_PREFIX}-${locale}`;
+          const kinto = new KintoHttpClient(
+            Services.prefs.getStringPref(RS_SERVER_PREF)
+          );
+          const record = await kinto
+            .bucket(RS_MAIN_BUCKET)
+            .collection(RS_COLLECTION_L10N)
+            .getRecord(recordId);
+          if (record && record.data) {
+            const downloader = new Downloader(
+              RS_MAIN_BUCKET,
+              RS_COLLECTION_L10N
+            );
+            // Await here in order to capture the exceptions for reporting.
+            await downloader.download(record.data, {
+              retries: RS_DOWNLOAD_MAX_RETRIES,
+            });
+          } else {
+            MessageLoaderUtils._handleRemoteSettingsUndesiredEvent(
+              "ASR_RS_NO_MESSAGES",
+              RS_COLLECTION_L10N,
+              options.dispatchToAS
+            );
+          }
         }
       } catch (e) {
         MessageLoaderUtils._handleRemoteSettingsUndesiredEvent(
@@ -497,6 +519,7 @@
       errors: [],
       extendedTripletsInitialized: false,
       showExtendedTriplets: true,
+      localeInUse: Services.locale.appLocaleAsLangTag,
     };
     this._triggerHandler = this._triggerHandler.bind(this);
     this._localProviders = localProviders;
@@ -508,6 +531,7 @@
     this._handleTargetingError = this._handleTargetingError.bind(this);
     this.onPrefChange = this.onPrefChange.bind(this);
     this.dispatch = this.dispatch.bind(this);
+    this._onLocaleChanged = this._onLocaleChanged.bind(this);
   }
 
   async onPrefChange(prefName) {
@@ -688,7 +712,7 @@
       const unseenListeners = new Set(ASRouterTriggerListeners.keys());
       for (const { trigger } of newState.messages) {
         if (trigger && ASRouterTriggerListeners.has(trigger.id)) {
-          await ASRouterTriggerListeners.get(trigger.id).init(
+          ASRouterTriggerListeners.get(trigger.id).init(
             this._triggerHandler,
             trigger.params,
             trigger.patterns
@@ -708,6 +732,33 @@
     }
   }
 
+  async _maybeUpdateL10nAttachment() {
+    const { localeInUse } = this.state.localeInUse;
+    const newLocale = Services.locale.appLocaleAsLangTag;
+    if (newLocale !== localeInUse) {
+      const providers = [...this.state.providers];
+      let needsUpdate = false;
+      providers.forEach(provider => {
+        if (RS_PROVIDERS_WITH_L10N.includes(provider.id)) {
+          // Force to refresh the messages as well as the attachment.
+          provider.lastUpdated = undefined;
+          needsUpdate = true;
+        }
+      });
+      if (needsUpdate) {
+        await this.setState({
+          localeInUse: newLocale,
+          providers,
+        });
+        await this.loadMessagesFromAllProviders();
+      }
+    }
+  }
+
+  async _onLocaleChanged(subject, topic, data) {
+    await this._maybeUpdateL10nAttachment();
+  }
+
   /**
    * init - Initializes the MessageRouter.
    * It is ready when it has been connected to a RemotePageManager instance.
@@ -781,6 +832,7 @@
       })
     );
 
+    Services.obs.addObserver(this._onLocaleChanged, TOPIC_INTL_LOCALE_CHANGED);
     // sets .initialized to true and resolves .waitForInitialized promise
     this._finishInitializing();
   }
@@ -808,6 +860,10 @@
     for (const listener of ASRouterTriggerListeners.values()) {
       listener.uninit();
     }
+    Services.obs.removeObserver(
+      this._onLocaleChanged,
+      TOPIC_INTL_LOCALE_CHANGED
+    );
     // If we added any CFR recommendations, they need to be removed
     CFRPageActions.clearRecommendations();
     this._resetInitialization();
@@ -1342,6 +1398,11 @@
    */
   routeMessageToTarget(message, target, trigger, force = false) {
     switch (message.template) {
+      case "whatsnew_panel_message":
+        if (force) {
+          ToolbarPanelHub.forceShowMessage(target, message);
+        }
+        break;
       case "cfr_doorhanger":
         if (force) {
           CFRPageActions.forceRecommendation(target, message, this.dispatch);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ASRouterTargeting.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ASRouterTargeting.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ASRouterTargeting.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ASRouterTargeting.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -2,54 +2,24 @@
  * 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/. */
 
-const { FilterExpressions } = ChromeUtils.import(
-  "resource://gre/modules/components-utils/FilterExpressions.jsm"
-);
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
-ChromeUtils.defineModuleGetter(
-  this,
-  "ASRouterPreferences",
-  "resource://activity-stream/lib/ASRouterPreferences.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "AddonManager",
-  "resource://gre/modules/AddonManager.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "NewTabUtils",
-  "resource://gre/modules/NewTabUtils.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "ProfileAge",
-  "resource://gre/modules/ProfileAge.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "ShellService",
-  "resource:///modules/ShellService.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "TelemetryEnvironment",
-  "resource://gre/modules/TelemetryEnvironment.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "AppConstants",
-  "resource://gre/modules/AppConstants.jsm"
-);
-ChromeUtils.defineModuleGetter(
-  this,
-  "AttributionCode",
-  "resource:///modules/AttributionCode.jsm"
-);
+XPCOMUtils.defineLazyModuleGetters(this, {
+  ASRouterPreferences: "resource://activity-stream/lib/ASRouterPreferences.jsm",
+  AddonManager: "resource://gre/modules/AddonManager.jsm",
+  NewTabUtils: "resource://gre/modules/NewTabUtils.jsm",
+  ProfileAge: "resource://gre/modules/ProfileAge.jsm",
+  ShellService: "resource:///modules/ShellService.jsm",
+  TelemetryEnvironment: "resource://gre/modules/TelemetryEnvironment.jsm",
+  AppConstants: "resource://gre/modules/AppConstants.jsm",
+  AttributionCode: "resource:///modules/AttributionCode.jsm",
+  FilterExpressions:
+    "resource://gre/modules/components-utils/FilterExpressions.jsm",
+});
+
 XPCOMUtils.defineLazyServiceGetter(
   this,
   "UpdateManager",
@@ -126,7 +96,7 @@
         const now = Date.now();
         const updateServiceListener = {
           onCheckComplete(request, updates) {
-            checker._value = updates.length > 0;
+            checker._value = !!updates.length;
             resolve(checker._value);
           },
           onError(request, update) {
@@ -168,6 +138,7 @@
     }),
     TotalBookmarksCount: new CachedTargetingGetter("getTotalBookmarksCount"),
     CheckBrowserNeedsUpdate: new CheckBrowserNeedsUpdate(),
+    RecentBookmarks: new CachedTargetingGetter("getRecentBookmarks"),
   },
 };
 
@@ -359,6 +330,9 @@
       }))
     );
   },
+  get recentBookmarks() {
+    return QueryCache.queries.RecentBookmarks.get();
+  },
   get pinnedSites() {
     return NewTabUtils.pinnedLinks.links.map(site =>
       site
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ASRouterTriggerListeners.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ASRouterTriggerListeners.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ASRouterTriggerListeners.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ASRouterTriggerListeners.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -4,41 +4,18 @@
 "use strict";
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-
-ChromeUtils.defineModuleGetter(
-  this,
-  "PrivateBrowsingUtils",
-  "resource://gre/modules/PrivateBrowsingUtils.jsm"
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
 );
 
+XPCOMUtils.defineLazyModuleGetters(this, {
+  PrivateBrowsingUtils: "resource://gre/modules/PrivateBrowsingUtils.jsm",
+  EveryWindow: "resource:///modules/EveryWindow.jsm",
+});
+
 const FEW_MINUTES = 15 * 60 * 1000; // 15 mins
 const MATCH_PATTERN_OPTIONS = { ignorePath: true };
 
-/**
- * Wait for browser startup to finish to avoid accessing uninitialized
- * properties
- */
-async function checkStartupFinished(win) {
-  if (!win.gBrowserInit.delayedStartupFinished) {
-    await new Promise(resolve => {
-      let delayedStartupObserver = (subject, topic) => {
-        if (topic === "browser-delayed-startup-finished" && subject === win) {
-          Services.obs.removeObserver(
-            delayedStartupObserver,
-            "browser-delayed-startup-finished"
-          );
-          resolve();
-        }
-      };
-
-      Services.obs.addObserver(
-        delayedStartupObserver,
-        "browser-delayed-startup-finished"
-      );
-    });
-  }
-}
-
 function isPrivateWindow(win) {
   return (
     !(win instanceof Ci.nsIDOMWindow) ||
@@ -101,30 +78,73 @@
  */
 this.ASRouterTriggerListeners = new Map([
   [
+    "openBookmarkedURL",
+    {
+      id: "openBookmarkedURL",
+      _initialized: false,
+      _triggerHandler: null,
+      _hosts: new Set(),
+      bookmarkEvent: "bookmark-icon-updated",
+
+      init(triggerHandler) {
+        if (!this._initialized) {
+          Services.obs.addObserver(this, this.bookmarkEvent);
+          this._triggerHandler = triggerHandler;
+          this._initialized = true;
+        }
+      },
+
+      observe(subject, topic, data) {
+        if (topic === this.bookmarkEvent && data === "starred") {
+          const browser = Services.wm.getMostRecentBrowserWindow();
+          if (browser) {
+            this._triggerHandler(browser.gBrowser.selectedBrowser, {
+              id: this.id,
+            });
+          }
+        }
+      },
+
+      uninit() {
+        if (this._initialized) {
+          Services.obs.removeObserver(this, this.bookmarkEvent);
+          this._initialized = false;
+          this._triggerHandler = null;
+          this._hosts = new Set();
+        }
+      },
+    },
+  ],
+  [
     "frequentVisits",
     {
+      id: "frequentVisits",
       _initialized: false,
       _triggerHandler: null,
       _hosts: null,
       _matchPatternSet: null,
       _visits: null,
 
-      async init(triggerHandler, hosts = [], patterns) {
+      init(triggerHandler, hosts = [], patterns) {
         if (!this._initialized) {
           this.onTabSwitch = this.onTabSwitch.bind(this);
-
-          // Add listeners to all existing browser windows
-          for (let win of Services.wm.getEnumerator("navigator:browser")) {
-            if (isPrivateWindow(win)) {
-              continue;
+          EveryWindow.registerCallback(
+            this.id,
+            win => {
+              if (!isPrivateWindow(win)) {
+                win.addEventListener("TabSelect", this.onTabSwitch);
+                win.gBrowser.addTabsProgressListener(this);
+              }
+            },
+            win => {
+              if (!isPrivateWindow(win)) {
+                win.removeEventListener("TabSelect", this.onTabSwitch);
+                win.gBrowser.removeTabsProgressListener(this);
+              }
             }
-            await checkStartupFinished(win);
-            win.addEventListener("TabSelect", this.onTabSwitch);
-            win.gBrowser.addTabsProgressListener(this);
-          }
-
-          this._initialized = true;
+          );
           this._visits = new Map();
+          this._initialized = true;
         }
         this._triggerHandler = triggerHandler;
         if (patterns) {
@@ -192,7 +212,7 @@
         }
 
         this._triggerHandler(aBrowser, {
-          id: "frequentVisits",
+          id: this.id,
           param: match,
           context: {
             // Remapped to {host, timestamp} because JEXL operators can only
@@ -223,52 +243,9 @@
         }
       },
 
-      observe(win, topic, data) {
-        let onLoad;
-
-        switch (topic) {
-          case "domwindowopened":
-            if (isPrivateWindow(win)) {
-              break;
-            }
-            onLoad = () => {
-              // Ignore non-browser windows.
-              if (
-                win.document.documentElement.getAttribute("windowtype") ===
-                "navigator:browser"
-              ) {
-                win.addEventListener("TabSelect", this.onTabSwitch);
-                win.gBrowser.addTabsProgressListener(this);
-              }
-            };
-            win.addEventListener("load", onLoad, { once: true });
-            break;
-
-          case "domwindowclosed":
-            if (
-              win instanceof Ci.nsIDOMWindow &&
-              win.document.documentElement.getAttribute("windowtype") ===
-                "navigator:browser"
-            ) {
-              win.removeEventListener("TabSelect", this.onTabSwitch);
-              win.gBrowser.removeTabsProgressListener(this);
-            }
-            break;
-        }
-      },
-
       uninit() {
         if (this._initialized) {
-          Services.ww.unregisterNotification(this);
-
-          for (let win of Services.wm.getEnumerator("navigator:browser")) {
-            if (isPrivateWindow(win)) {
-              continue;
-            }
-
-            win.removeEventListener("TabSelect", this.onTabSwitch);
-            win.gBrowser.removeTabsProgressListener(this);
-          }
+          EveryWindow.unregisterCallback(this.id);
 
           this._initialized = false;
           this._triggerHandler = null;
@@ -288,6 +265,7 @@
   [
     "openURL",
     {
+      id: "openURL",
       _initialized: false,
       _triggerHandler: null,
       _hosts: null,
@@ -296,21 +274,24 @@
        * If the listener is already initialised, `init` will replace the trigger
        * handler and add any new hosts to `this._hosts`.
        */
-      async init(triggerHandler, hosts = [], patterns) {
+      init(triggerHandler, hosts = [], patterns) {
         if (!this._initialized) {
           this.onLocationChange = this.onLocationChange.bind(this);
-
-          // Listen for new windows being opened
-          Services.ww.registerNotification(this);
-
-          // Add listeners to all existing browser windows
-          for (let win of Services.wm.getEnumerator("navigator:browser")) {
-            if (isPrivateWindow(win)) {
-              continue;
+          EveryWindow.registerCallback(
+            this.id,
+            win => {
+              if (!isPrivateWindow(win)) {
+                win.addEventListener("TabSelect", this.onTabSwitch);
+                win.gBrowser.addTabsProgressListener(this);
+              }
+            },
+            win => {
+              if (!isPrivateWindow(win)) {
+                win.removeEventListener("TabSelect", this.onTabSwitch);
+                win.gBrowser.removeTabsProgressListener(this);
+              }
             }
-            await checkStartupFinished(win);
-            win.gBrowser.addTabsProgressListener(this);
-          }
+          );
 
           this._initialized = true;
         }
@@ -324,15 +305,7 @@
 
       uninit() {
         if (this._initialized) {
-          Services.ww.unregisterNotification(this);
-
-          for (let win of Services.wm.getEnumerator("navigator:browser")) {
-            if (isPrivateWindow(win)) {
-              continue;
-            }
-
-            win.gBrowser.removeTabsProgressListener(this);
-          }
+          EveryWindow.unregisterCallback(this.id);
 
           this._initialized = false;
           this._triggerHandler = null;
@@ -354,42 +327,10 @@
             aRequest
           );
           if (match) {
-            this._triggerHandler(aBrowser, { id: "openURL", param: match });
+            this._triggerHandler(aBrowser, { id: this.id, param: match });
           }
         }
       },
-
-      observe(win, topic, data) {
-        let onLoad;
-
-        switch (topic) {
-          case "domwindowopened":
-            if (isPrivateWindow(win)) {
-              break;
-            }
-            onLoad = () => {
-              // Ignore non-browser windows.
-              if (
-                win.document.documentElement.getAttribute("windowtype") ===
-                "navigator:browser"
-              ) {
-                win.gBrowser.addTabsProgressListener(this);
-              }
-            };
-            win.addEventListener("load", onLoad, { once: true });
-            break;
-
-          case "domwindowclosed":
-            if (
-              win instanceof Ci.nsIDOMWindow &&
-              win.document.documentElement.getAttribute("windowtype") ===
-                "navigator:browser"
-            ) {
-              win.gBrowser.removeTabsProgressListener(this);
-            }
-            break;
-        }
-      },
     },
   ],
 
@@ -443,22 +384,25 @@
       _sessionPageLoad: 0,
       onLocationChange: null,
 
-      async init(triggerHandler, params, patterns) {
+      init(triggerHandler, params, patterns) {
         params.forEach(p => this._events.push(p));
 
         if (!this._initialized) {
           Services.obs.addObserver(this, "SiteProtection:ContentBlockingEvent");
-
           this.onLocationChange = this._onLocationChange.bind(this);
-
-          // Add listeners to all existing browser windows
-          for (let win of Services.wm.getEnumerator("navigator:browser")) {
-            if (isPrivateWindow(win)) {
-              continue;
+          EveryWindow.registerCallback(
+            this.id,
+            win => {
+              if (!isPrivateWindow(win)) {
+                win.gBrowser.addTabsProgressListener(this);
+              }
+            },
+            win => {
+              if (!isPrivateWindow(win)) {
+                win.gBrowser.removeTabsProgressListener(this);
+              }
             }
-            await checkStartupFinished(win);
-            win.gBrowser.addTabsProgressListener(this);
-          }
+          );
 
           this._initialized = true;
         }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/CFRPageActions.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/CFRPageActions.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/CFRPageActions.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/CFRPageActions.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -14,6 +14,17 @@
   "PrivateBrowsingUtils",
   "resource://gre/modules/PrivateBrowsingUtils.jsm"
 );
+ChromeUtils.defineModuleGetter(
+  this,
+  "L10nRegistry",
+  "resource://gre/modules/L10nRegistry.jsm"
+);
+ChromeUtils.defineModuleGetter(
+  this,
+  "FileSource",
+  "resource://gre/modules/L10nRegistry.jsm"
+);
+ChromeUtils.defineModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
 
 const POPUP_NOTIFICATION_ID = "contextual-feature-recommendation";
 const ANIMATION_BUTTON_ID = "cfr-notification-footer-animation-button";
@@ -32,6 +43,12 @@
 };
 
 /**
+ * The downloaded Fluent file is located in this sub-directory of the local
+ * profile directory.
+ */
+const RS_DOWNLOADED_FILE_SUBDIR = "settings/main/ms-language-packs";
+
+/**
  * A WeakMap from browsers to {host, recommendation} pairs. Recommendations are
  * defined in the ExtensionDoorhanger.schema.json.
  *
@@ -68,12 +85,7 @@
     this._showPopupOnClick = this._showPopupOnClick.bind(this);
     this.dispatchUserAction = this.dispatchUserAction.bind(this);
 
-    this._l10n = new DOMLocalization([
-      "browser/newtab/asrouter.ftl",
-      "browser/branding/brandings.ftl",
-      "browser/branding/sync-brand.ftl",
-      "branding/brand.ftl",
-    ]);
+    this._l10n = this._createDOML10n();
 
     // Saved timeout IDs for scheduled state changes, so they can be cancelled
     this.stateTransitionTimeoutIDs = [];
@@ -104,6 +116,52 @@
     }
   }
 
+  /**
+   * Creates a new DOMLocalization instance with the Fluent file from Remote Settings.
+   * Note that it still uses the packaged Fluent file as the fallback if the remote one
+   * is not available.
+   */
+  _createDOML10n() {
+    async function* generateBundles(resourceIds) {
+      const appLocale = Services.locale.appLocaleAsBCP47;
+      const appLocales = Services.locale.appLocalesAsBCP47;
+      const l10nFluentDir = OS.Path.join(
+        OS.Constants.Path.localProfileDir,
+        RS_DOWNLOADED_FILE_SUBDIR
+      );
+      const fs = new FileSource("cfr", [appLocale], `file://${l10nFluentDir}/`);
+      // In the case that the Fluent file has not been downloaded from Remote Settings,
+      // `fetchFile` will return `false` and fall back to the packaged Fluent file.
+      const resource = await fs.fetchFile(appLocale, "asrouter.ftl");
+      if (resource) {
+        // Skip the local `asrouter.ftl` (i.e. the first resource) to favor the remote one.
+        // Other resources such as `branding.ftl`, `sync-brand.ftl`, and `branding/brand.ftl`
+        // still need to be packed into this bundle because, otherwise, we can't reference
+        // them across different Fluent bundles.
+        for await (let bundle of L10nRegistry.generateBundles(
+          [appLocale],
+          resourceIds.slice(1)
+        )) {
+          // Override the old string ID if any as it's the last resource.
+          bundle.addResource(resource, true);
+          yield bundle;
+        }
+      } else {
+        yield* L10nRegistry.generateBundles(appLocales, resourceIds);
+      }
+    }
+
+    return new DOMLocalization(
+      [
+        "browser/newtab/asrouter.ftl",
+        "browser/branding/brandings.ftl",
+        "browser/branding/sync-brand.ftl",
+        "branding/brand.ftl",
+      ],
+      generateBundles
+    );
+  }
+
   async showAddressBarNotifier(recommendation, shouldExpand = false) {
     this.container.hidden = false;
 
@@ -199,7 +257,7 @@
   }
 
   _clearScheduledStateChanges() {
-    while (this.stateTransitionTimeoutIDs.length > 0) {
+    while (this.stateTransitionTimeoutIDs.length) {
       // clearTimeout is safe even with invalid/expired IDs
       this.window.clearTimeout(this.stateTransitionTimeoutIDs.pop());
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/PanelTestProvider.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/PanelTestProvider.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/PanelTestProvider.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/PanelTestProvider.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -133,6 +133,55 @@
     targeting: `firefoxVersion > 69 && totalBlockedCount > 0`,
     trigger: { id: "whatsNewPanelOpened" },
   },
+  {
+    id: "BOOKMARK_CFR",
+    template: "cfr_doorhanger",
+    content: {
+      layout: "icon_and_message",
+      category: "cfrFeatures",
+      notification_text: { string_id: "cfr-doorhanger-extension-notification" },
+      heading_text: { string_id: "cfr-doorhanger-sync-bookmarks-header" },
+      info_icon: {
+        label: { string_id: "cfr-doorhanger-extension-sumo-link" },
+        sumo_path: "https://example.com",
+      },
+      text: { string_id: "cfr-doorhanger-sync-bookmarks-body" },
+      icon: "chrome://branding/content/icon64.png",
+      buttons: {
+        primary: {
+          label: { string_id: "cfr-doorhanger-sync-bookmarks-ok-button" },
+          action: {
+            type: "OPEN_PREFERENCES_PAGE",
+            data: { category: "sync" },
+          },
+        },
+        secondary: [
+          {
+            label: { string_id: "cfr-doorhanger-extension-cancel-button" },
+            action: { type: "CANCEL" },
+          },
+          {
+            label: {
+              string_id: "cfr-doorhanger-extension-never-show-recommendation",
+            },
+          },
+          {
+            label: {
+              string_id: "cfr-doorhanger-extension-manage-settings-button",
+            },
+            action: {
+              type: "OPEN_PREFERENCES_PAGE",
+              data: { category: "general-cfrfeatures" },
+            },
+          },
+        ],
+      },
+    },
+    targeting: "true",
+    trigger: {
+      id: "openBookmarkedURL",
+    },
+  },
 ];
 
 const PanelTestProvider = {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/PlacesFeed.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/PlacesFeed.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/PlacesFeed.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/PlacesFeed.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -366,7 +366,7 @@
   _getSearchPrefix() {
     const searchAliases =
       Services.search.defaultEngine.wrappedJSObject.__internalAliases;
-    if (searchAliases && searchAliases.length > 0) {
+    if (searchAliases && searchAliases.length) {
       return `${searchAliases[0]} `;
     }
     return "";
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ShortURL.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ShortURL.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ShortURL.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ShortURL.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -71,7 +71,7 @@
 
   // Remove the eTLD (e.g., com, net) and the preceding period from the hostname
   const eTLD = getETLD(hostname);
-  const eTLDExtra = eTLD.length > 0 ? -(eTLD.length + 1) : Infinity;
+  const eTLDExtra = eTLD.length ? -(eTLD.length + 1) : Infinity;
 
   // Ideally get the short eTLD-less host but fall back to longer url parts
   return (
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/SnippetsTestMessageProvider.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/SnippetsTestMessageProvider.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/SnippetsTestMessageProvider.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/SnippetsTestMessageProvider.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -141,6 +141,7 @@
       scene2_newsletter: "mozilla-foundation",
       success_text: "Check your inbox for the confirmation!",
       error_text: "Error!",
+      retry_button_label: "Try again?",
       links: {
         privacyLink: {
           url:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ToolbarPanelHub.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ToolbarPanelHub.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/ToolbarPanelHub.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/ToolbarPanelHub.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -27,6 +27,7 @@
 const PANEL_HEADER_SELECTOR = "#PanelUI-whatsNew-title > label";
 
 const BUTTON_STRING_ID = "cfr-whatsnew-button";
+const WHATS_NEW_PANEL_SELECTOR = "PanelUI-whatsNew-message-container";
 
 class _ToolbarPanelHub {
   constructor() {
@@ -154,8 +155,10 @@
   }
 
   // Render what's new messages into the panel.
-  async renderMessages(win, doc, containerId) {
-    const messages = (await this.messages).sort(this._sortWhatsNewMessages);
+  async renderMessages(win, doc, containerId, options = {}) {
+    const messages =
+      (options.force && options.messages) ||
+      (await this.messages).sort(this._sortWhatsNewMessages);
     const container = doc.getElementById(containerId);
 
     if (messages && !container.querySelector(".whatsNew-message")) {
@@ -190,6 +193,16 @@
     });
   }
 
+  removeMessages(win, containerId) {
+    const doc = win.document;
+    const messageNodes = doc
+      .getElementById(containerId)
+      .querySelectorAll(".whatsNew-message");
+    for (const messageNode of messageNodes) {
+      messageNode.remove();
+    }
+  }
+
   /**
    * Attach click event listener defined in message payload
    */
@@ -375,7 +388,7 @@
   // If `string_id` is present it means we are relying on fluent for translations.
   // Otherwise, we have a vanilla string.
   _setString(doc, el, stringObj) {
-    if (stringObj.string_id) {
+    if (stringObj && stringObj.string_id) {
       doc.l10n.setAttributes(
         el,
         stringObj.string_id,
@@ -390,7 +403,7 @@
   // If `string_id` is present it means we are relying on fluent for translations.
   // Otherwise, we have a vanilla string.
   _setTextAttribute(doc, el, attr, stringObj) {
-    if (stringObj.string_id) {
+    if (stringObj && stringObj.string_id) {
       doc.l10n.setAttributes(el, stringObj.string_id);
     } else {
       el.setAttribute(attr, stringObj);
@@ -521,6 +534,23 @@
       }
     );
   }
+
+  /**
+   * @param {object} browser MessageChannel target argument as a response to a user action
+   * @param {object} message Message selected from devtools page
+   */
+  forceShowMessage(browser, message) {
+    const win = browser.browser.ownerGlobal;
+    const doc = browser.browser.ownerDocument;
+    this.removeMessages(win, WHATS_NEW_PANEL_SELECTOR);
+    this.renderMessages(win, doc, WHATS_NEW_PANEL_SELECTOR, {
+      force: true,
+      messages: [message],
+    });
+    win.PanelUI.panel.addEventListener("popuphidden", event =>
+      this.removeMessages(event.target.ownerGlobal, WHATS_NEW_PANEL_SELECTOR)
+    );
+  }
 }
 
 this._ToolbarPanelHub = _ToolbarPanelHub;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/TopStoriesFeed.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/TopStoriesFeed.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/lib/TopStoriesFeed.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/lib/TopStoriesFeed.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -314,7 +314,7 @@
       );
       this.domainAffinitiesLastUpdated = affinities._timestamp;
     }
-    if (stories && stories.length > 0 && this.storiesLastUpdated === 0) {
+    if (stories && !!stories.length && this.storiesLastUpdated === 0) {
       this.updateSettings(data.stories.settings);
       this.stories = this.rotate(this.transform(stories));
       this.storiesLastUpdated = data.stories._timestamp;
@@ -328,7 +328,7 @@
         this.cleanUpCampaignImpressionPref();
       }
     }
-    if (topics && topics.length > 0 && this.topicsLastUpdated === 0) {
+    if (topics && !!topics.length && this.topicsLastUpdated === 0) {
       this.topics = topics;
       this.topicsLastUpdated = data.topics._timestamp;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/ASRouterFeed.test.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/ASRouterFeed.test.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/ASRouterFeed.test.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/ASRouterFeed.test.js	2019-09-15 11:33:06.000000000 +0000
@@ -3,6 +3,7 @@
 import { ASRouterFeed } from "lib/ASRouterFeed.jsm";
 import { actionTypes as at } from "common/Actions.jsm";
 import { GlobalOverrider } from "test/unit/utils";
+import { ASRouterPreferences } from "lib/ASRouterPreferences.jsm";
 
 describe("ASRouterFeed", () => {
   let Router;
@@ -28,9 +29,12 @@
       init: sandbox.stub(),
       uninit: sandbox.stub(),
     };
-    globals.set("BookmarkPanelHub", FakeBookmarkPanelHub);
-    globals.set("ToolbarBadgeHub", FakeToolbarBadgeHub);
-    globals.set("ToolbarPanelHub", FakeToolbarPanelHub);
+    globals.set({
+      ASRouterPreferences,
+      BookmarkPanelHub: FakeBookmarkPanelHub,
+      ToolbarBadgeHub: FakeToolbarBadgeHub,
+      ToolbarPanelHub: FakeToolbarPanelHub,
+    });
 
     Router = new _ASRouter({ providers: [FAKE_LOCAL_PROVIDER] });
     FakeToolbarPanelHub = {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/ASRouter.test.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/ASRouter.test.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/ASRouter.test.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/ASRouter.test.js	2019-09-15 11:33:06.000000000 +0000
@@ -18,7 +18,10 @@
   PARENT_TO_CHILD_MESSAGE_NAME,
 } from "./constants";
 import { actionCreators as ac } from "common/Actions.jsm";
-import { ASRouterPreferences } from "lib/ASRouterPreferences.jsm";
+import {
+  ASRouterPreferences,
+  TARGETING_PREFERENCES,
+} from "lib/ASRouterPreferences.jsm";
 import { ASRouterTriggerListeners } from "lib/ASRouterTriggerListeners.jsm";
 import { CFRPageActions } from "lib/CFRPageActions.jsm";
 import { GlobalOverrider } from "test/unit/utils";
@@ -141,6 +144,7 @@
     FakeToolbarPanelHub = {
       init: sandbox.stub(),
       uninit: sandbox.stub(),
+      forceShowMessage: sandbox.stub(),
     };
     FakeToolbarBadgeHub = {
       init: sandbox.stub(),
@@ -148,6 +152,11 @@
       registerBadgeNotificationListener: sandbox.stub(),
     };
     globals.set({
+      ASRouterPreferences,
+      TARGETING_PREFERENCES,
+      ASRouterTargeting,
+      ASRouterTriggerListeners,
+      QueryCache,
       AttributionCode: fakeAttributionCode,
       // Testing framework doesn't know how to `defineLazyModuleGetter` so we're
       // importing these modules into the global scope ourselves.
@@ -156,6 +165,22 @@
       BookmarkPanelHub: FakeBookmarkPanelHub,
       ToolbarBadgeHub: FakeToolbarBadgeHub,
       ToolbarPanelHub: FakeToolbarPanelHub,
+      KintoHttpClient: class {
+        bucket() {
+          return this;
+        }
+        collection() {
+          return this;
+        }
+        getRecord() {
+          return Promise.resolve({ data: {} });
+        }
+      },
+      Downloader: class {
+        download() {
+          return Promise.resolve("/path/to/downlowned");
+        }
+      },
     });
     await createRouterAndInit();
   });
@@ -296,6 +321,16 @@
         })
       );
     });
+    it("should add observer for `intl:app-locales-changed`", async () => {
+      sandbox.spy(global.Services.obs, "addObserver");
+      await createRouterAndInit();
+
+      assert.calledOnce(global.Services.obs.addObserver);
+      assert.equal(
+        global.Services.obs.addObserver.args[0][1],
+        "intl:app-locales-changed"
+      );
+    });
     describe("lazily loading local test providers", () => {
       afterEach(() => {
         Router.uninit();
@@ -465,10 +500,26 @@
       sandbox.stub(CFRPageActions, "addRecommendation");
       target = { sendAsyncMessage: sandbox.stub() };
     });
+    it("should route whatsnew_panel_message message to the right hub", () => {
+      Router.routeMessageToTarget(
+        { template: "whatsnew_panel_message" },
+        target,
+        "",
+        true
+      );
+
+      assert.calledOnce(FakeToolbarPanelHub.forceShowMessage);
+      assert.notCalled(FakeToolbarBadgeHub.registerBadgeNotificationListener);
+      assert.notCalled(FakeBookmarkPanelHub._forceShowMessage);
+      assert.notCalled(CFRPageActions.addRecommendation);
+      assert.notCalled(CFRPageActions.forceRecommendation);
+      assert.notCalled(target.sendAsyncMessage);
+    });
     it("should route toolbar_badge message to the right hub", () => {
       Router.routeMessageToTarget({ template: "toolbar_badge" }, target);
 
       assert.calledOnce(FakeToolbarBadgeHub.registerBadgeNotificationListener);
+      assert.notCalled(FakeToolbarPanelHub.forceShowMessage);
       assert.notCalled(FakeBookmarkPanelHub._forceShowMessage);
       assert.notCalled(CFRPageActions.addRecommendation);
       assert.notCalled(CFRPageActions.forceRecommendation);
@@ -483,6 +534,7 @@
       );
 
       assert.calledOnce(FakeBookmarkPanelHub._forceShowMessage);
+      assert.notCalled(FakeToolbarPanelHub.forceShowMessage);
       assert.notCalled(FakeToolbarBadgeHub.registerBadgeNotificationListener);
       assert.notCalled(CFRPageActions.addRecommendation);
       assert.notCalled(CFRPageActions.forceRecommendation);
@@ -497,6 +549,7 @@
       );
 
       assert.calledOnce(CFRPageActions.addRecommendation);
+      assert.notCalled(FakeToolbarPanelHub.forceShowMessage);
       assert.notCalled(FakeBookmarkPanelHub._forceShowMessage);
       assert.notCalled(FakeToolbarBadgeHub.registerBadgeNotificationListener);
       assert.notCalled(CFRPageActions.forceRecommendation);
@@ -511,6 +564,7 @@
       );
 
       assert.calledOnce(CFRPageActions.forceRecommendation);
+      assert.notCalled(FakeToolbarPanelHub.forceShowMessage);
       assert.notCalled(CFRPageActions.addRecommendation);
       assert.notCalled(FakeBookmarkPanelHub._forceShowMessage);
       assert.notCalled(FakeToolbarBadgeHub.registerBadgeNotificationListener);
@@ -520,6 +574,7 @@
       Router.routeMessageToTarget({ template: "snippets" }, target, {}, true);
 
       assert.calledOnce(target.sendAsyncMessage);
+      assert.notCalled(FakeToolbarPanelHub.forceShowMessage);
       assert.notCalled(CFRPageActions.forceRecommendation);
       assert.notCalled(CFRPageActions.addRecommendation);
       assert.notCalled(FakeBookmarkPanelHub._forceShowMessage);
@@ -686,6 +741,54 @@
         type: "AS_ROUTER_TELEMETRY_USER_EVENT",
       });
     });
+    it("should download the attachment if RemoteSettings returns some messages", async () => {
+      sandbox
+        .stub(global.Services.locale, "appLocaleAsLangTag")
+        .get(() => "en-US");
+      sandbox
+        .stub(MessageLoaderUtils, "_getRemoteSettingsMessages")
+        .resolves([{ id: "message_1" }]);
+      const spy = sandbox.spy();
+      global.Downloader.prototype.download = spy;
+      const provider = {
+        id: "cfr",
+        enabled: true,
+        type: "remote-settings",
+        bucket: "cfr",
+      };
+      await createRouterAndInit([provider]);
+
+      assert.calledOnce(spy);
+    });
+    it("should dispatch undesired event if the ms-language-packs returns no messages", async () => {
+      sandbox
+        .stub(global.Services.locale, "appLocaleAsLangTag")
+        .get(() => "en-US");
+      sandbox
+        .stub(MessageLoaderUtils, "_getRemoteSettingsMessages")
+        .resolves([{ id: "message_1" }]);
+      sandbox
+        .stub(global.KintoHttpClient.prototype, "getRecord")
+        .resolves(null);
+      const provider = {
+        id: "cfr",
+        enabled: true,
+        type: "remote-settings",
+        bucket: "cfr",
+      };
+      await createRouterAndInit([provider]);
+
+      assert.calledWith(Router.dispatchToAS, {
+        data: {
+          action: "asrouter_undesired_event",
+          event: "ASR_RS_NO_MESSAGES",
+          value: "ms-language-packs",
+          message_id: "n/a",
+        },
+        meta: { from: "ActivityStream:Content", to: "ActivityStream:Main" },
+        type: "AS_ROUTER_TELEMETRY_USER_EVENT",
+      });
+    });
   });
 
   describe("#_updateMessageProviders", () => {
@@ -999,6 +1102,16 @@
         sinon.match.number
       );
     });
+    it("should remove the observer for `intl:app-locales-changed`", () => {
+      sandbox.spy(global.Services.obs, "removeObserver");
+      Router.uninit();
+
+      assert.calledOnce(global.Services.obs.removeObserver);
+      assert.equal(
+        global.Services.obs.removeObserver.args[0][1],
+        "intl:app-locales-changed"
+      );
+    });
   });
 
   describe("onMessage", () => {
@@ -3060,4 +3173,67 @@
       assert.equal(result, "bar");
     });
   });
+
+  describe("#_onLocaleChanged", () => {
+    it("should call _maybeUpdateL10nAttachment in the handler", async () => {
+      sandbox.spy(Router, "_maybeUpdateL10nAttachment");
+      await Router._onLocaleChanged();
+
+      assert.calledOnce(Router._maybeUpdateL10nAttachment);
+    });
+  });
+
+  describe("#_maybeUpdateL10nAttachment", () => {
+    it("should update the l10n attachment if the locale was changed", async () => {
+      const getter = sandbox.stub();
+      getter.onFirstCall().returns("en-US");
+      getter.onSecondCall().returns("fr");
+      sandbox.stub(global.Services.locale, "appLocaleAsLangTag").get(getter);
+      const provider = {
+        id: "cfr",
+        enabled: true,
+        type: "remote-settings",
+        bucket: "cfr",
+      };
+      await createRouterAndInit([provider]);
+      sandbox.spy(Router, "setState");
+      sandbox.spy(Router, "loadMessagesFromAllProviders");
+
+      await Router._maybeUpdateL10nAttachment();
+
+      assert.calledWith(Router.setState, {
+        localeInUse: "fr",
+        providers: [
+          {
+            id: "cfr",
+            enabled: true,
+            type: "remote-settings",
+            bucket: "cfr",
+            lastUpdated: undefined,
+            errors: [],
+          },
+        ],
+      });
+      assert.calledOnce(Router.loadMessagesFromAllProviders);
+    });
+    it("should not update the l10n attachment if the provider doesn't need l10n attachment", async () => {
+      const getter = sandbox.stub();
+      getter.onFirstCall().returns("en-US");
+      getter.onSecondCall().returns("fr");
+      sandbox.stub(global.Services.locale, "appLocaleAsLangTag").get(getter);
+      const provider = {
+        id: "localProvider",
+        enabled: true,
+        type: "local",
+      };
+      await createRouterAndInit([provider]);
+      sandbox.spy(Router, "setState");
+      sandbox.spy(Router, "loadMessagesFromAllProviders");
+
+      await Router._maybeUpdateL10nAttachment();
+
+      assert.notCalled(Router.setState);
+      assert.notCalled(Router.loadMessagesFromAllProviders);
+    });
+  });
 });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/ASRouterTriggerListeners.test.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/ASRouterTriggerListeners.test.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/ASRouterTriggerListeners.test.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/ASRouterTriggerListeners.test.js	2019-09-15 11:33:06.000000000 +0000
@@ -3,54 +3,100 @@
 
 describe("ASRouterTriggerListeners", () => {
   let sandbox;
-  let registerWindowNotificationStub;
-  let unregisterWindoNotificationStub;
-  let windowEnumeratorStub;
+  let globals;
   let existingWindow;
+  let isWindowPrivateStub;
   const triggerHandler = () => {};
   const openURLListener = ASRouterTriggerListeners.get("openURL");
   const frequentVisitsListener = ASRouterTriggerListeners.get("frequentVisits");
+  const bookmarkedURLListener = ASRouterTriggerListeners.get(
+    "openBookmarkedURL"
+  );
   const hosts = ["www.mozilla.com", "www.mozilla.org"];
 
-  function resetEnumeratorStub(windows) {
-    windowEnumeratorStub.withArgs("navigator:browser").returns(windows);
-  }
-
   beforeEach(async () => {
     sandbox = sinon.createSandbox();
-    registerWindowNotificationStub = sandbox.stub(
-      global.Services.ww,
-      "registerNotification"
-    );
-    unregisterWindoNotificationStub = sandbox.stub(
-      global.Services.ww,
-      "unregisterNotification"
-    );
+    globals = new GlobalOverrider();
     existingWindow = {
       gBrowser: {
         addTabsProgressListener: sandbox.stub(),
         removeTabsProgressListener: sandbox.stub(),
         currentURI: { host: "" },
       },
-      gBrowserInit: { delayedStartupFinished: true },
       addEventListener: sinon.stub(),
       removeEventListener: sinon.stub(),
     };
-    windowEnumeratorStub = sandbox.stub(global.Services.wm, "getEnumerator");
-    resetEnumeratorStub([existingWindow]);
     sandbox.spy(openURLListener, "init");
     sandbox.spy(openURLListener, "uninit");
+    isWindowPrivateStub = sandbox.stub();
+    // Assume no window is private so that we execute the action
+    isWindowPrivateStub.returns(false);
+    globals.set("PrivateBrowsingUtils", {
+      isWindowPrivate: isWindowPrivateStub,
+    });
+    const ewUninit = new Map();
+    globals.set("EveryWindow", {
+      registerCallback: (id, init, uninit) => {
+        init(existingWindow);
+        ewUninit.set(id, uninit);
+      },
+      unregisterCallback: id => {
+        ewUninit.get(id)(existingWindow);
+      },
+    });
   });
   afterEach(() => {
     sandbox.restore();
+    globals.restore();
+  });
+
+  describe("openBookmarkedURL", () => {
+    let observerStub;
+    describe("#init", () => {
+      beforeEach(() => {
+        observerStub = sandbox.stub(global.Services.obs, "addObserver");
+        sandbox
+          .stub(global.Services.wm, "getMostRecentBrowserWindow")
+          .returns({ gBrowser: { selectedBrowser: {} } });
+      });
+      afterEach(() => {
+        bookmarkedURLListener.uninit();
+      });
+      it("should set hosts to the recentBookmarks", async () => {
+        await bookmarkedURLListener.init(sandbox.stub());
+
+        assert.calledOnce(observerStub);
+        assert.calledWithExactly(
+          observerStub,
+          bookmarkedURLListener,
+          "bookmark-icon-updated"
+        );
+      });
+      it("should provide id to triggerHandler", async () => {
+        const newTriggerHandler = sinon.stub();
+        const subject = {};
+        await bookmarkedURLListener.init(newTriggerHandler);
+
+        bookmarkedURLListener.observe(
+          subject,
+          "bookmark-icon-updated",
+          "starred"
+        );
+
+        assert.calledOnce(newTriggerHandler);
+        assert.calledWithExactly(newTriggerHandler, subject, {
+          id: bookmarkedURLListener.id,
+        });
+      });
+    });
   });
 
   describe("frequentVisits", () => {
     let _triggerHandler;
-    beforeEach(async () => {
+    beforeEach(() => {
       _triggerHandler = sandbox.stub();
       sandbox.useFakeTimers();
-      await frequentVisitsListener.init(_triggerHandler, hosts);
+      frequentVisitsListener.init(_triggerHandler, hosts);
     });
     afterEach(() => {
       sandbox.clock.restore();
@@ -106,29 +152,26 @@
       assert.notCalled(stub);
     });
     describe("MatchPattern", () => {
-      let globals;
       beforeEach(() => {
-        globals = new GlobalOverrider();
         globals.set(
           "MatchPatternSet",
           sandbox.stub().callsFake(patterns => ({ patterns }))
         );
       });
       afterEach(() => {
-        globals.restore();
         frequentVisitsListener.uninit();
       });
-      it("should create a matchPatternSet", async () => {
-        await frequentVisitsListener.init(_triggerHandler, hosts, ["pattern"]);
+      it("should create a matchPatternSet", () => {
+        frequentVisitsListener.init(_triggerHandler, hosts, ["pattern"]);
 
         assert.calledOnce(window.MatchPatternSet);
         assert.calledWithExactly(window.MatchPatternSet, ["pattern"], {
           ignorePath: true,
         });
       });
-      it("should allow to add multiple patterns and dedupe", async () => {
-        await frequentVisitsListener.init(_triggerHandler, hosts, ["pattern"]);
-        await frequentVisitsListener.init(_triggerHandler, hosts, ["foo"]);
+      it("should allow to add multiple patterns and dedupe", () => {
+        frequentVisitsListener.init(_triggerHandler, hosts, ["pattern"]);
+        frequentVisitsListener.init(_triggerHandler, hosts, ["foo"]);
 
         assert.calledTwice(window.MatchPatternSet);
         assert.calledWithExactly(
@@ -147,8 +190,8 @@
     });
 
     describe("#init", () => {
-      beforeEach(async () => {
-        await openURLListener.init(triggerHandler, hosts);
+      beforeEach(() => {
+        openURLListener.init(triggerHandler, hosts);
       });
       afterEach(() => {
         openURLListener.uninit();
@@ -160,11 +203,6 @@
         assert.equal(openURLListener._triggerHandler, triggerHandler);
       });
 
-      it("should register an open-window notification", () => {
-        assert.calledOnce(registerWindowNotificationStub);
-        assert.calledWith(registerWindowNotificationStub, openURLListener);
-      });
-
       it("should add tab progress listeners to all existing browser windows", () => {
         assert.calledOnce(existingWindow.gBrowser.addTabsProgressListener);
         assert.calledWithExactly(
@@ -176,8 +214,6 @@
       it("if already initialised, should only update the trigger handler and add the new hosts", () => {
         const newHosts = ["www.example.com"];
         const newTriggerHandler = () => {};
-        resetEnumeratorStub([existingWindow]);
-        registerWindowNotificationStub.reset();
         existingWindow.gBrowser.addTabsProgressListener.reset();
 
         openURLListener.init(newTriggerHandler, newHosts);
@@ -187,16 +223,13 @@
           new Set([...hosts, ...newHosts])
         );
         assert.equal(openURLListener._triggerHandler, newTriggerHandler);
-        assert.notCalled(registerWindowNotificationStub);
         assert.notCalled(existingWindow.gBrowser.addTabsProgressListener);
       });
     });
 
     describe("#uninit", () => {
       beforeEach(async () => {
-        await openURLListener.init(triggerHandler, hosts);
-        // Ensure that the window enumerator will return the existing window for uninit as well
-        resetEnumeratorStub([existingWindow]);
+        openURLListener.init(triggerHandler, hosts);
         openURLListener.uninit();
       });
 
@@ -206,11 +239,6 @@
         assert.equal(openURLListener._triggerHandler, null);
       });
 
-      it("should remove an open-window notification", () => {
-        assert.calledOnce(unregisterWindoNotificationStub);
-        assert.calledWith(unregisterWindoNotificationStub, openURLListener);
-      });
-
       it("should remove tab progress listeners from all existing browser windows", () => {
         assert.calledOnce(existingWindow.gBrowser.removeTabsProgressListener);
         assert.calledWithExactly(
@@ -220,13 +248,10 @@
       });
 
       it("should do nothing if already uninitialised", () => {
-        unregisterWindoNotificationStub.reset();
         existingWindow.gBrowser.removeTabsProgressListener.reset();
-        resetEnumeratorStub([existingWindow]);
 
         openURLListener.uninit();
         assert.notOk(openURLListener._initialized);
-        assert.notCalled(unregisterWindoNotificationStub);
         assert.notCalled(existingWindow.gBrowser.removeTabsProgressListener);
       });
     });
@@ -237,9 +262,9 @@
         frequentVisitsListener.uninit();
       });
 
-      it("should call the ._triggerHandler with the right arguments", async () => {
+      it("should call the ._triggerHandler with the right arguments", () => {
         const newTriggerHandler = sinon.stub();
-        await openURLListener.init(newTriggerHandler, hosts);
+        openURLListener.init(newTriggerHandler, hosts);
 
         const browser = {};
         const webProgress = { isTopLevel: true };
@@ -254,10 +279,10 @@
           param: { host: "www.mozilla.org", url: "www.mozilla.org" },
         });
       });
-      it("should call triggerHandler for a redirect (openURL + frequentVisits)", async () => {
+      it("should call triggerHandler for a redirect (openURL + frequentVisits)", () => {
         for (let trigger of [openURLListener, frequentVisitsListener]) {
           const newTriggerHandler = sinon.stub();
-          await trigger.init(newTriggerHandler, hosts);
+          trigger.init(newTriggerHandler, hosts);
 
           const browser = {};
           const webProgress = { isTopLevel: true };
@@ -280,9 +305,9 @@
           assert.calledOnce(newTriggerHandler);
         }
       });
-      it("should call triggerHandler with the right arguments (redirect)", async () => {
+      it("should call triggerHandler with the right arguments (redirect)", () => {
         const newTriggerHandler = sinon.stub();
-        await openURLListener.init(newTriggerHandler, hosts);
+        openURLListener.init(newTriggerHandler, hosts);
 
         const browser = {};
         const webProgress = { isTopLevel: true };
@@ -306,10 +331,10 @@
           param: { host: "www.mozilla.org", url: "www.mozilla.org" },
         });
       });
-      it("should call triggerHandler for a redirect (openURL + frequentVisits)", async () => {
+      it("should call triggerHandler for a redirect (openURL + frequentVisits)", () => {
         for (let trigger of [openURLListener, frequentVisitsListener]) {
           const newTriggerHandler = sinon.stub();
-          await trigger.init(newTriggerHandler, hosts);
+          trigger.init(newTriggerHandler, hosts);
 
           const browser = {};
           const webProgress = { isTopLevel: true };
@@ -332,9 +357,9 @@
           assert.calledOnce(newTriggerHandler);
         }
       });
-      it("should call triggerHandler with the right arguments (redirect)", async () => {
+      it("should call triggerHandler with the right arguments (redirect)", () => {
         const newTriggerHandler = sinon.stub();
-        await openURLListener.init(newTriggerHandler, hosts);
+        openURLListener.init(newTriggerHandler, hosts);
 
         const browser = {};
         const webProgress = { isTopLevel: true };
@@ -358,9 +383,9 @@
           param: { host: "www.mozilla.org", url: "www.mozilla.org" },
         });
       });
-      it("should fail for subdomains (not redirect)", async () => {
+      it("should fail for subdomains (not redirect)", () => {
         const newTriggerHandler = sinon.stub();
-        await openURLListener.init(newTriggerHandler, hosts);
+        openURLListener.init(newTriggerHandler, hosts);
 
         const browser = {};
         const webProgress = { isTopLevel: true };
@@ -386,25 +411,5 @@
         assert.notCalled(newTriggerHandler);
       });
     });
-
-    describe("delayed startup finished", () => {
-      beforeEach(() => {
-        existingWindow.gBrowserInit.delayedStartupFinished = false;
-        sandbox
-          .stub(global.Services.obs, "addObserver")
-          .callsFake(fn =>
-            fn(existingWindow, "browser-delayed-startup-finished")
-          );
-      });
-      afterEach(() => {
-        openURLListener.uninit();
-      });
-
-      it("should wait for startup and then add the tabs listener", async () => {
-        await openURLListener.init(triggerHandler, hosts);
-
-        assert.calledOnce(existingWindow.gBrowser.addTabsProgressListener);
-      });
-    });
   });
 });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/CFRMessageProvider.test.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/CFRMessageProvider.test.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/CFRMessageProvider.test.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/CFRMessageProvider.test.js	2019-09-15 11:33:06.000000000 +0000
@@ -51,8 +51,8 @@
     const pinTabMessage = messages.find(m => m.id === "PIN_TAB");
 
     assert.isTrue(
-      pinTabMessage.trigger.params.filter(host => host.startsWith("www."))
-        .length > 0
+      !!pinTabMessage.trigger.params.filter(host => host.startsWith("www."))
+        .length
     );
   });
 });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/PanelTestProvider.test.js	2019-09-15 11:33:06.000000000 +0000
@@ -8,7 +8,7 @@
   it("should have a message", () => {
     // Careful: when changing this number make sure that new messages also go
     // through schema verifications.
-    assert.lengthOf(messages, 7);
+    assert.lengthOf(messages, 8);
   });
   it("should be a valid message", () => {
     const fxaMessages = messages.filter(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/templates/FXASignupSnippet.test.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/templates/FXASignupSnippet.test.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/templates/FXASignupSnippet.test.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/templates/FXASignupSnippet.test.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -47,13 +47,13 @@
       onAction: sandbox.stub(),
     };
     const wrapper = mount(<FXASignupSnippet {...defaults} />);
-    // SendToDeviceSnippet is a wrapper around SubmitFormSnippet
+    // FXASignupSnippet is a wrapper around SubmitFormSnippet
     const { props } = wrapper.children().get(0);
 
     const defaultProperties = Object.keys(schema.properties).filter(
       prop => schema.properties[prop].default
     );
-    assert.lengthOf(defaultProperties, 4);
+    assert.lengthOf(defaultProperties, 5);
     defaultProperties.forEach(prop =>
       assert.propertyVal(props.content, prop, schema.properties[prop].default)
     );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/templates/NewsletterSnippet.test.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/templates/NewsletterSnippet.test.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/templates/NewsletterSnippet.test.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/templates/NewsletterSnippet.test.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -50,7 +50,7 @@
         onAction: sandbox.stub(),
       };
       const wrapper = mount(<NewsletterSnippet {...defaults} />);
-      // SendToDeviceSnippet is a wrapper around SubmitFormSnippet
+      // NewsletterSnippet is a wrapper around SubmitFormSnippet
       const { props } = wrapper.children().get(0);
 
       // the `locale` properties gets used as part of hidden_fields so we
@@ -62,7 +62,7 @@
       const defaultProperties = Object.keys(properties).filter(
         prop => properties[prop].default
       );
-      assert.lengthOf(defaultProperties, 5);
+      assert.lengthOf(defaultProperties, 6);
       defaultProperties.forEach(prop =>
         assert.propertyVal(props.content, prop, properties[prop].default)
       );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/templates/SendToDeviceSnippet.test.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/templates/SendToDeviceSnippet.test.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/templates/SendToDeviceSnippet.test.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/templates/SendToDeviceSnippet.test.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -80,7 +80,7 @@
     const defaultProperties = Object.keys(schema.properties).filter(
       prop => schema.properties[prop].default
     );
-    assert.lengthOf(defaultProperties, 6);
+    assert.lengthOf(defaultProperties, 7);
     defaultProperties.forEach(prop =>
       assert.propertyVal(props.content, prop, schema.properties[prop].default)
     );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/templates/SubmitFormSnippet.test.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/templates/SubmitFormSnippet.test.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/asrouter/templates/SubmitFormSnippet.test.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/asrouter/templates/SubmitFormSnippet.test.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -8,6 +8,7 @@
   scene1_text: "foo",
   scene2_text: "bar",
   scene1_button_label: "Sign Up",
+  retry_button_label: "Try again",
   form_action: "foo.com",
   hidden_inputs: { foo: "foo" },
   error_text: "error",
@@ -289,7 +290,8 @@
     it("should render the button to return to the signup form if there was an error", () => {
       wrapper.setState({ signupSubmitted: true, signupSuccess: false });
 
-      assert.isTrue(wrapper.find(".ASRouterButton").exists());
+      const button = wrapper.find("button.ASRouterButton");
+      assert.equal(button.text(), "Try again");
       wrapper.find(".ASRouterButton").simulate("click");
 
       assert.equal(wrapper.state().signupSubmitted, false);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSCard.test.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -240,7 +240,7 @@
       wrapper.instance().observer = {
         unobserve: sandbox.stub(),
       };
-      wrapper.instance().placholderElement = "element";
+      wrapper.instance().placeholderElement = "element";
 
       wrapper.instance().onSeen([
         {
@@ -258,7 +258,7 @@
 
     it("should setup proper placholder ref for isSeen", () => {
       wrapper.instance().setPlaceholderRef("element");
-      assert.equal(wrapper.instance().placholderElement, "element");
+      assert.equal(wrapper.instance().placeholderElement, "element");
     });
 
     it("should setup observer on componentDidMount", () => {
@@ -266,6 +266,24 @@
       assert.isTrue(!!wrapper.instance().observer);
     });
   });
+  describe("DSCard with Idle Callback", () => {
+    let windowStub = {
+      requestIdleCallback: sinon.stub().returns(1),
+      cancelIdleCallback: sinon.stub(),
+    };
+    beforeEach(() => {
+      wrapper = shallow(<DSCard windowObj={windowStub} />);
+    });
+
+    it("should call requestIdleCallback on componentDidMount", () => {
+      assert.calledOnce(windowStub.requestIdleCallback);
+    });
+
+    it("should call cancelIdleCallback on componentWillUnmount", () => {
+      wrapper.instance().componentWillUnmount();
+      assert.calledOnce(windowStub.cancelIdleCallback);
+    });
+  });
 });
 
 describe("<PlaceholderDSCard> component", () => {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSLinkMenu.test.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSLinkMenu.test.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSLinkMenu.test.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/content-src/components/DiscoveryStreamComponents/DSLinkMenu.test.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -31,9 +31,8 @@
     });
 
     it("Should add active on Menu Show", async () => {
-      wrapper.instance().onMenuShow();
-      // Wait for next frame to allow fluent to render strings
-      await new Promise(r => requestAnimationFrame(r));
+      wrapper.instance().nextAnimationFrame = () => {};
+      await wrapper.instance().onMenuShow();
       wrapper.update();
       assert.equal(parentNode.className, "active");
     });
@@ -42,13 +41,20 @@
       const fakeWindow = { scrollMaxX: "20" };
       wrapper = mount(<DSLinkMenu windowObj={fakeWindow} />);
       parentNode = wrapper.getDOMNode().parentNode;
-      wrapper.instance().onMenuShow();
-      // Wait for next frame to allow fluent to render strings
-      await new Promise(r => requestAnimationFrame(r));
+      wrapper.instance().nextAnimationFrame = () => {};
+      await wrapper.instance().onMenuShow();
       wrapper.update();
       assert.equal(parentNode.className, "last-item active");
     });
 
+    it("Should call rAF from nextAnimationFrame", () => {
+      const fakeWindow = { requestAnimationFrame: sinon.stub() };
+      wrapper = mount(<DSLinkMenu windowObj={fakeWindow} />);
+
+      wrapper.instance().nextAnimationFrame();
+      assert.calledOnce(fakeWindow.requestAnimationFrame);
+    });
+
     it("should remove .active and .last-item classes from the parent component", () => {
       const instance = wrapper.instance();
       const remove = sinon.stub();
@@ -64,12 +70,11 @@
     it("should add .active and .last-item classes to the parent component", async () => {
       const instance = wrapper.instance();
       const add = sinon.stub();
+      instance.nextAnimationFrame = () => {};
       instance.contextMenuButtonRef = {
         current: { parentElement: { parentElement: { classList: { add } } } },
       };
-      instance.onMenuShow();
-      // Wait for next frame to allow fluent to render strings
-      await new Promise(r => requestAnimationFrame(r));
+      await instance.onMenuShow();
       assert.calledOnce(add);
     });
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/content-src/components/TopSites.test.jsx firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/content-src/components/TopSites.test.jsx
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/content-src/components/TopSites.test.jsx	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/content-src/components/TopSites.test.jsx	2019-09-15 11:33:06.000000000 +0000
@@ -463,7 +463,7 @@
   it("should have rtl direction automatically set for text", () => {
     const wrapper = shallow(<TopSiteLink link={link} />);
 
-    assert.isTrue(wrapper.find("[dir='auto']").length > 0);
+    assert.isTrue(!!wrapper.find("[dir='auto']").length);
   });
   it("should render a title", () => {
     const wrapper = shallow(<TopSiteLink link={link} title="foobar" />);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/lib/ActivityStream.test.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/lib/ActivityStream.test.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/lib/ActivityStream.test.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/lib/ActivityStream.test.js	2019-09-15 11:33:06.000000000 +0000
@@ -271,6 +271,18 @@
 
       assert.isTrue(PREFS_CONFIG.get("feeds.section.topstories").value);
     });
+    it("should not change default even with expected geo and locale", () => {
+      as._defaultPrefs.set("feeds.section.topstories", false);
+      sandbox.stub(global.Services.prefs, "getStringPref").returns("US");
+      sandbox
+        .stub(global.Services.locale, "appLocaleAsLangTag")
+        .get(() => "en-US");
+
+      as._updateDynamicPrefs();
+      clock.tick(1);
+
+      assert.isFalse(PREFS_CONFIG.get("feeds.section.topstories").value);
+    });
   });
   describe("telemetry reporting on init failure", () => {
     it("should send a ping on init error", () => {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/lib/ToolbarPanelHub.test.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/lib/ToolbarPanelHub.test.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/lib/ToolbarPanelHub.test.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/lib/ToolbarPanelHub.test.js	2019-09-15 11:33:06.000000000 +0000
@@ -33,10 +33,12 @@
       setAttribute: sandbox.stub(),
       removeAttribute: sandbox.stub(),
       querySelector: sandbox.stub().returns(null),
+      querySelectorAll: sandbox.stub().returns([]),
       appendChild: sandbox.stub(),
       addEventListener: sandbox.stub(),
       hasAttribute: sandbox.stub(),
       toggleAttribute: sandbox.stub(),
+      remove: sandbox.stub(),
     };
     fakeDocument = {
       l10n: {
@@ -75,6 +77,7 @@
         gBrowser: "gBrowser",
       },
       PanelUI: {
+        panel: fakeElementById,
         whatsNewPanel: fakeElementById,
       },
     };
@@ -558,6 +561,65 @@
         );
       });
     });
+    describe("#forceShowMessage", () => {
+      const panelSelector = "PanelUI-whatsNew-message-container";
+      let removeMessagesSpy;
+      let renderMessagesStub;
+      let addEventListenerStub;
+      let message;
+      let browser;
+      beforeEach(async () => {
+        message = (await PanelTestProvider.getMessages()).find(
+          m => m.id === "WHATS_NEW_70_1"
+        );
+        removeMessagesSpy = sandbox.spy(instance, "removeMessages");
+        renderMessagesStub = sandbox.spy(instance, "renderMessages");
+        addEventListenerStub = fakeElementById.addEventListener;
+        browser = {
+          browser: { ownerGlobal: fakeWindow, ownerDocument: fakeDocument },
+        };
+        fakeElementById.querySelectorAll.returns([fakeElementById]);
+      });
+      it("should call removeMessages when forcing a message to show", () => {
+        instance.forceShowMessage(browser, message);
+
+        assert.calledOnce(removeMessagesSpy);
+        assert.calledWithExactly(removeMessagesSpy, fakeWindow, panelSelector);
+      });
+      it("should call renderMessages when forcing a message to show", () => {
+        instance.forceShowMessage(browser, message);
+
+        assert.calledOnce(renderMessagesStub);
+        assert.calledWithExactly(
+          renderMessagesStub,
+          fakeWindow,
+          fakeDocument,
+          panelSelector,
+          {
+            force: true,
+            messages: [message],
+          }
+        );
+      });
+      it("should cleanup after the panel is hidden when forcing a message to show", () => {
+        instance.forceShowMessage(browser, message);
+
+        assert.calledOnce(addEventListenerStub);
+        assert.calledWithExactly(
+          addEventListenerStub,
+          "popuphidden",
+          sinon.match.func
+        );
+
+        const [, cb] = addEventListenerStub.firstCall.args;
+        // Reset the call count from the first `forceShowMessage` call
+        removeMessagesSpy.resetHistory();
+        cb({ target: { ownerGlobal: fakeWindow } });
+
+        assert.calledOnce(removeMessagesSpy);
+        assert.calledWithExactly(removeMessagesSpy, fakeWindow, panelSelector);
+      });
+    });
   });
   describe("#insertProtectionPanelMessage", () => {
     const fakeInsert = () =>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/unit-entry.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/unit-entry.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/unit-entry.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/unit-entry.js	2019-09-15 11:33:06.000000000 +0000
@@ -128,6 +128,10 @@
     reportError() {},
   },
   dump() {},
+  EveryWindow: {
+    registerCallback: (id, init, uninit) => {},
+    unregisterCallback: id => {},
+  },
   fetch() {},
   // eslint-disable-next-line object-shorthand
   Image: function() {}, // NB: This is a function/constructor
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/utils.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/utils.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/newtab/test/unit/utils.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/newtab/test/unit/utils.js	2019-09-15 11:33:06.000000000 +0000
@@ -77,6 +77,9 @@
       if ("initHook" in args) {
         args.initHook.call(this);
       }
+      if (args.defaultBranch) {
+        this.prefs = {};
+      }
     }
     this._prefBranch = {};
     this.observers = {};
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/originattributes/test/browser/file_windowOpenerRestrictionTarget.html firefox-trunk-71.0~a1~hg20190915r493291/browser/components/originattributes/test/browser/file_windowOpenerRestrictionTarget.html
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/originattributes/test/browser/file_windowOpenerRestrictionTarget.html	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/originattributes/test/browser/file_windowOpenerRestrictionTarget.html	2019-09-15 11:33:06.000000000 +0000
@@ -10,7 +10,7 @@
     // Therefore, it should fail at this setting.
     let openerRestriction = true;
     let cookieValue;
-    if (window.location.search.length > 0) {
+    if (window.location.search.length) {
       cookieValue = window.location.search.substr(1);
       openerRestriction = false;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/payments/PaymentUIService.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/payments/PaymentUIService.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/payments/PaymentUIService.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/payments/PaymentUIService.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -245,7 +245,7 @@
 
       if (
         !browser.tabModalPromptBox ||
-        browser.tabModalPromptBox.listPrompts().length == 0
+        !browser.tabModalPromptBox.listPrompts().length
       ) {
         browser.removeAttribute("tabmodalPromptShowing");
       }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/payments/res/components/address-option.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/payments/res/components/address-option.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/payments/res/components/address-option.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/payments/res/components/address-option.js	2019-09-15 11:33:06.000000000 +0000
@@ -143,7 +143,7 @@
         continue;
       }
 
-      if (lineEl.children.length > 0) {
+      if (lineEl.children.length) {
         lineEl.append(this.dataset.fieldSeparator);
       }
       lineEl.appendChild(fieldEl);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/payments/res/paymentRequest.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/payments/res/paymentRequest.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/payments/res/paymentRequest.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/payments/res/paymentRequest.js	2019-09-15 11:33:06.000000000 +0000
@@ -143,8 +143,8 @@
       },
     };
 
-    let hasSavedAddresses = Object.keys(this.getAddresses(state)).length != 0;
-    let hasSavedCards = Object.keys(this.getBasicCards(state)).length != 0;
+    let hasSavedAddresses = !!Object.keys(this.getAddresses(state)).length;
+    let hasSavedCards = !!Object.keys(this.getBasicCards(state)).length;
     let shippingRequested = state.request.paymentOptions.requestShipping;
 
     // Onboarding wizard flow.
@@ -282,7 +282,7 @@
       let supportedNetworks =
         (modifier.data && modifier.data.supportedNetworks) || [];
       return (
-        supportedNetworks.length == 0 ||
+        !supportedNetworks.length ||
         supportedNetworks.includes(selectedMethod["cc-type"])
       );
     });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/payments/test/mochitest/test_address_form.html firefox-trunk-71.0~a1~hg20190915r493291/browser/components/payments/test/mochitest/test_address_form.html
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/payments/test/mochitest/test_address_form.html	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/payments/test/mochitest/test_address_form.html	2019-09-15 11:33:06.000000000 +0000
@@ -582,7 +582,7 @@
   display.appendChild(form);
   await asyncElementRendered();
 
-  ok(form.querySelectorAll(":-moz-ui-invalid").length > 0, "Check fields are visibly invalid");
+  ok(!!form.querySelectorAll(":-moz-ui-invalid").length, "Check fields are visibly invalid");
   info("merchant cleared the errors");
   await form.requestStore.setState({
     request: {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/payments/test/mochitest/test_basic_card_form.html firefox-trunk-71.0~a1~hg20190915r493291/browser/components/payments/test/mochitest/test_basic_card_form.html
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/payments/test/mochitest/test_basic_card_form.html	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/payments/test/mochitest/test_basic_card_form.html	2019-09-15 11:33:06.000000000 +0000
@@ -445,7 +445,7 @@
     },
   });
   await asyncElementRendered();
-  ok(form.querySelectorAll(":-moz-ui-invalid").length > 0,
+  ok(!!form.querySelectorAll(":-moz-ui-invalid").length,
      "Check fields are visibly invalid on an 'edit' form with missing fields");
   checkCCForm(form, minimalCard);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/browserPlacesViews.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/browserPlacesViews.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/browserPlacesViews.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/browserPlacesViews.js	2019-09-15 11:33:06.000000000 +0000
@@ -820,7 +820,7 @@
 
     // Remove any delayed element, see _cleanPopup for details.
     if ("_delayedRemovals" in popup) {
-      while (popup._delayedRemovals.length > 0) {
+      while (popup._delayedRemovals.length) {
         popup.removeChild(popup._delayedRemovals.shift());
       }
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/controller.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/controller.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/controller.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/controller.js	2019-09-15 11:33:06.000000000 +0000
@@ -939,7 +939,7 @@
       );
     }
 
-    if (transactions.length > 0) {
+    if (transactions.length) {
       await PlacesUIUtils.batchUpdatesForNode(
         this._view.result,
         totalItems,
@@ -1114,7 +1114,7 @@
   },
 
   _releaseClipboardOwnership: function PC__releaseClipboardOwnership() {
-    if (this.cutNodes.length > 0) {
+    if (this.cutNodes.length) {
       // This clears the logical clipboard, doesn't remove data.
       this.clipboard.emptyClipboard(Ci.nsIClipboard.kGlobalClipboard);
     }
@@ -1175,7 +1175,7 @@
     // This order matters here!  It controls how this and other applications
     // select data to be inserted based on type.
     contents.forEach(function(content) {
-      if (content.entries.length > 0) {
+      if (content.entries.length) {
         hasData = true;
         let glue =
           content.type == PlacesUtils.TYPE_X_MOZ_PLACE ? "," : PlacesUtils.endl;
@@ -1309,7 +1309,7 @@
       this._clearClipboard();
     }
 
-    if (itemsToSelect.length > 0) {
+    if (itemsToSelect.length) {
       this._view.selectItems(itemsToSelect, false);
     }
   },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/editBookmark.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/editBookmark.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/editBookmark.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/editBookmark.js	2019-09-15 11:33:06.000000000 +0000
@@ -188,7 +188,7 @@
       await PlacesUtils.keywords.fetch({ url: this._paneInfo.uri.spec }, e =>
         entries.push(e)
       );
-      if (entries.length > 0) {
+      if (entries.length) {
         // We show an existing keyword if either POST data was not provided, or
         // if the POST data is the same.
         let existingKeyword = entries[0].keyword;
@@ -580,13 +580,13 @@
     let inputTags = this._getTagsArrayFromTagsInputField();
 
     // Optimize the trivial cases (which are actually the most common).
-    if (inputTags.length == 0 && aCurrentTags.length == 0) {
+    if (!inputTags.length && !aCurrentTags.length) {
       return { newTags: [], removedTags: [] };
     }
-    if (inputTags.length == 0) {
+    if (!inputTags.length) {
       return { newTags: [], removedTags: aCurrentTags };
     }
-    if (aCurrentTags.length == 0) {
+    if (!aCurrentTags.length) {
       return { newTags: inputTags, removedTags: [] };
     }
 
@@ -609,7 +609,7 @@
 
     let setTags = async () => {
       let promises = [];
-      if (removedTags.length > 0) {
+      if (removedTags.length) {
         let promise = PlacesTransactions.Untag({
           urls: aURIs,
           tags: removedTags,
@@ -619,7 +619,7 @@
         this.transactionPromises.push(promise);
         promises.push(promise);
       }
-      if (newTags.length > 0) {
+      if (newTags.length) {
         let promise = PlacesTransactions.Tag({ urls: aURIs, tags: newTags })
           .transact()
           .catch(Cu.reportError);
@@ -995,7 +995,7 @@
     return tags
       .trim()
       .split(/\s*,\s*/) // Split on commas and remove spaces.
-      .filter(tag => tag.length > 0); // Kill empty tags.
+      .filter(tag => !!tag.length); // Kill empty tags.
   },
 
   async newFolder() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/places.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/places.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/places.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/places.js	2019-09-15 11:33:06.000000000 +0000
@@ -255,12 +255,12 @@
     aEvent.stopPropagation();
     switch (aEvent.command) {
       case "Back":
-        if (this._backHistory.length > 0) {
+        if (this._backHistory.length) {
           this.back();
         }
         break;
       case "Forward":
-        if (this._forwardHistory.length > 0) {
+        if (this._forwardHistory.length) {
           this.forward();
         }
         break;
@@ -297,7 +297,7 @@
     this.updateDetailsPane();
 
     // update navigation commands
-    if (this._backHistory.length == 0) {
+    if (!this._backHistory.length) {
       document
         .getElementById("OrganizerCommand:Back")
         .setAttribute("disabled", true);
@@ -306,7 +306,7 @@
         .getElementById("OrganizerCommand:Back")
         .removeAttribute("disabled");
     }
-    if (this._forwardHistory.length == 0) {
+    if (!this._forwardHistory.length) {
       document
         .getElementById("OrganizerCommand:Forward")
         .setAttribute("disabled", true);
@@ -543,7 +543,7 @@
 
     (async function() {
       let backupFiles = await PlacesBackups.getBackupFiles();
-      if (backupFiles.length == 0) {
+      if (!backupFiles.length) {
         return;
       }
 
@@ -829,7 +829,7 @@
    */
   _folders: [],
   get folders() {
-    if (this._folders.length == 0) {
+    if (!this._folders.length) {
       this._folders = PlacesUtils.bookmarks.userContentRoots;
     }
     return this._folders;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/places-tree.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/places-tree.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/places-tree.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/places-tree.js	2019-09-15 11:33:06.000000000 +0000
@@ -741,7 +741,7 @@
 
         var concreteGuid = PlacesUtils.getConcreteItemGuid(node);
         if (
-          guids.length == 0 ||
+          !guids.length ||
           !PlacesUtils.nodeIsContainer(node) ||
           checkedGuidsSet.has(concreteGuid)
         ) {
@@ -768,11 +768,7 @@
         // this node if we don't find any additional results here.
         var previousOpenness = node.containerOpen;
         node.containerOpen = true;
-        for (
-          var child = 0;
-          child < node.childCount && guids.length > 0;
-          child++
-        ) {
+        for (var child = 0; child < node.childCount && guids.length; child++) {
           var childNode = node.getChild(child);
           var found = findNodes(childNode);
           if (!foundOne) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/treeView.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/treeView.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/content/treeView.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/content/treeView.js	2019-09-15 11:33:06.000000000 +0000
@@ -175,7 +175,7 @@
     // for which nodeRemoved was called).
     let ancestors = Array.from(PlacesUtils.nodeAncestors(aNode));
     if (
-      ancestors.length == 0 ||
+      !ancestors.length ||
       ancestors[ancestors.length - 1] != this._rootNode
     ) {
       throw new Error("Removed node passed to _getRowForNode");
@@ -522,7 +522,7 @@
     aNodesInfo,
     aUpdatedContainer
   ) {
-    if (aNodesInfo.length == 0) {
+    if (!aNodesInfo.length) {
       return;
     }
 
@@ -855,7 +855,7 @@
 
     // Persist selection state.
     let nodesToReselect = this._getSelectedNodesInRange(oldRow, oldRow + count);
-    if (nodesToReselect.length > 0) {
+    if (nodesToReselect.length) {
       this.selection.selectEventsSuppressed = true;
     }
 
@@ -875,7 +875,7 @@
     this.nodeInserted(aNewParent, aNode, aNewIndex);
 
     // Restore selection.
-    if (nodesToReselect.length > 0) {
+    if (nodesToReselect.length) {
       this._restoreSelection(nodesToReselect, aNewParent);
       this.selection.selectEventsSuppressed = false;
     }
@@ -1061,7 +1061,7 @@
       // Select the row next to the closed container if any of its
       // children were selected, and nothing else is selected.
       if (
-        nodesToReselect.length > 0 &&
+        nodesToReselect.length &&
         nodesToReselect.length == oldSelectionCount
       ) {
         this.selection.rangedSelect(startReplacement, startReplacement, true);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/PlacesUIUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/PlacesUIUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/PlacesUIUtils.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/PlacesUIUtils.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -920,7 +920,7 @@
           return Ci.nsINavHistoryResultNode.RESULT_TYPE_FOLDER;
         }
 
-        if (this.uri.length == 0) {
+        if (!this.uri.length) {
           throw new Error("Unexpected item type");
         }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/tests/browser/browser_paste_into_tags.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/tests/browser/browser_paste_into_tags.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/tests/browser/browser_paste_into_tags.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/tests/browser/browser_paste_into_tags.js	2019-09-15 11:33:06.000000000 +0000
@@ -66,7 +66,7 @@
   await PlacesUtils.bookmarks.fetch({ url: MOZURISPEC }, bm => {
     bookmarks.push(bm);
   });
-  ok(bookmarks.length > 0, "bookmark exists for the tagged history item");
+  ok(!!bookmarks.length, "bookmark exists for the tagged history item");
 
   // is the bookmark visible in the UI?
   // get the Unsorted Bookmarks node
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/tests/browser/browser_sort_in_library.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/tests/browser/browser_sort_in_library.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/places/tests/browser/browser_sort_in_library.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/places/tests/browser/browser_sort_in_library.js	2019-09-15 11:33:06.000000000 +0000
@@ -170,7 +170,7 @@
  */
 function testSortByColAndDir(aOrganizerWin, aPlaceContentTree, aUnsortFirst) {
   let cols = aPlaceContentTree.getElementsByTagName("treecol");
-  ok(cols.length > 0, "sanity check: placeContent should contain columns");
+  ok(!!cols.length, "sanity check: placeContent should contain columns");
 
   for (let i = 0; i < cols.length; i++) {
     let col = cols.item(i);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/browserLanguages.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/browserLanguages.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/browserLanguages.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/browserLanguages.js	2019-09-15 11:33:06.000000000 +0000
@@ -66,7 +66,7 @@
   let entries = await RemoteSettings("language-dictionaries").get({
     filters: { id: locale },
   });
-  if (entries.length > 0) {
+  if (entries.length) {
     return entries[0].dictionaries;
   }
   return [];
@@ -512,7 +512,7 @@
 
   async loadLocalesFromInstalled(available) {
     let items;
-    if (available.length > 0) {
+    if (available.length) {
       items = await getLocaleDisplayInfo(available);
       items.push(await this.createInstalledLabel());
     } else {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/findInPage.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/findInPage.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/findInPage.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/findInPage.js	2019-09-15 11:33:06.000000000 +0000
@@ -194,7 +194,7 @@
       this.getFindSelection(startNode.ownerGlobal).addRange(range);
     }
 
-    return indices.length > 0;
+    return !!indices.length;
   },
 
   /**
@@ -567,7 +567,7 @@
         .getAttribute("search-l10n-ids")
         .split(",")
         .map(s => s.trim().split("."))
-        .filter(s => s[0].length > 0);
+        .filter(s => !!s[0].length);
 
       const messages = await document.l10n.formatMessages(
         refs.map(ref => ({ id: ref[0] }))
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/main.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/main.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/main.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/main.js	2019-09-15 11:33:06.000000000 +0000
@@ -1062,7 +1062,7 @@
   /* Confirm the locale change and restart the browser in the new locale. */
   confirmBrowserLanguageChange(event) {
     let localesString = (event.target.getAttribute("locales") || "").trim();
-    if (!localesString || localesString.length == 0) {
+    if (!localesString || !localesString.length) {
       return;
     }
     let locales = localesString.split(",");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/subdialogs.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/subdialogs.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/subdialogs.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/subdialogs.js	2019-09-15 11:33:06.000000000 +0000
@@ -618,7 +618,7 @@
   _nextDialogID: 0,
   _preloadDialog: null,
   get _topDialog() {
-    return this._dialogs.length > 0
+    return this._dialogs.length
       ? this._dialogs[this._dialogs.length - 1]
       : undefined;
   },
@@ -639,7 +639,7 @@
       return;
     }
 
-    if (this._dialogs.length == 0) {
+    if (!this._dialogs.length) {
       // When opening the first dialog, show the dialog stack to make sure
       // the browser binding can be constructed.
       this._dialogStack.hidden = false;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/tests/browser_browser_languages_subdialog.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/tests/browser_browser_languages_subdialog.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/tests/browser_browser_languages_subdialog.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/tests/browser_browser_languages_subdialog.js	2019-09-15 11:33:06.000000000 +0000
@@ -184,7 +184,7 @@
 
   // Make sure we got some data.
   ok(
-    snapshot.parent && snapshot.parent.length > 0,
+    snapshot.parent && !!snapshot.parent.length,
     "Got parent telemetry events in the snapshot"
   );
 
@@ -603,7 +603,7 @@
 
   await BrowserTestUtils.waitForCondition(async () => {
     let newDicts = await AddonManager.getAddonsByTypes(["dictionary"]);
-    let done = newDicts.length != 0;
+    let done = !!newDicts.length;
 
     if (done) {
       is(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/tests/browser_bug410900.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/tests/browser_bug410900.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/tests/browser_bug410900.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/tests/browser_bug410900.js	2019-09-15 11:33:06.000000000 +0000
@@ -32,7 +32,7 @@
   ok(rbox, "handlersView is present");
 
   var items = rbox && rbox.getElementsByTagName("richlistitem");
-  ok(items && items.length > 0, "App handler list populated");
+  ok(items && !!items.length, "App handler list populated");
 
   var handlerAdded = false;
   for (let i = 0; i < items.length; i++) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/tests/browser_cookies_exceptions.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/tests/browser_cookies_exceptions.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/tests/browser_cookies_exceptions.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/tests/browser_cookies_exceptions.js	2019-09-15 11:33:06.000000000 +0000
@@ -546,7 +546,7 @@
           return;
         }
 
-        if (observances.length == 0) {
+        if (!observances.length) {
           // Should fail here as we are not expecting a notification, but we
           // don't. See bug 1063410.
           return;
@@ -576,7 +576,7 @@
           );
         }
 
-        if (observances.length == 0) {
+        if (!observances.length) {
           Services.obs.removeObserver(permObserver, "perm-changed");
           executeSoon(resolve);
         }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/tests/browser_permissions_checkPermissionsWereAdded.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/tests/browser_permissions_checkPermissionsWereAdded.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/tests/browser_permissions_checkPermissionsWereAdded.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/tests/browser_permissions_checkPermissionsWereAdded.js	2019-09-15 11:33:06.000000000 +0000
@@ -49,7 +49,7 @@
   buttonDialog.click();
   let permissionsBox = dialog.document.getElementById("permissionsBox");
   let children = permissionsBox.getElementsByAttribute("origin", "*");
-  is(children.length == 0, false, "Website added in url should be in the list");
+  is(!children.length, false, "Website added in url should be in the list");
 };
 
 const _checkIfPermissionsWereAdded = (dialog, expectedResult) => {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/tests/siteData/head.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/tests/siteData/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/in-content/tests/siteData/head.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/in-content/tests/siteData/head.js	2019-09-15 11:33:06.000000000 +0000
@@ -262,7 +262,7 @@
 function promiseServiceWorkersCleared() {
   return BrowserTestUtils.waitForCondition(() => {
     let serviceWorkers = serviceWorkerManager.getAllRegistrations();
-    if (serviceWorkers.length == 0) {
+    if (!serviceWorkers.length) {
       ok(true, "Cleared all service workers");
       return true;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/languages.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/languages.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/languages.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/languages.js	2019-09-15 11:33:06.000000000 +0000
@@ -186,7 +186,7 @@
     // result in overflow.
     await document.l10n.translateFragment(this._activeLanguages);
 
-    if (this._activeLanguages.childNodes.length > 0) {
+    if (this._activeLanguages.childNodes.length) {
       this._activeLanguages.ensureIndexIsVisible(selectedIndex);
       this._activeLanguages.selectedIndex = selectedIndex;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/siteDataSettings.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/siteDataSettings.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/preferences/siteDataSettings.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/preferences/siteDataSettings.js	2019-09-15 11:33:06.000000000 +0000
@@ -148,8 +148,8 @@
     let items = this._list.getElementsByTagName("richlistitem");
     let removeSelectedBtn = document.getElementById("removeSelected");
     let removeAllBtn = document.getElementById("removeAll");
-    removeSelectedBtn.disabled = this._list.selectedItems.length == 0;
-    removeAllBtn.disabled = items.length == 0;
+    removeSelectedBtn.disabled = !this._list.selectedItems.length;
+    removeAllBtn.disabled = !items.length;
 
     let l10nId = this._searchBox.value
       ? "site-data-remove-shown"
@@ -259,7 +259,7 @@
       .filter(site => site.userAction == "remove")
       .map(site => site.host);
 
-    if (removals.length > 0) {
+    if (removals.length) {
       if (this._sites.length == removals.length) {
         allowed = SiteDataManager.promptSiteDataRemoval(window);
         if (allowed) {
@@ -323,7 +323,7 @@
 
   onClickRemoveAll() {
     let siteItems = this._list.getElementsByTagName("richlistitem");
-    if (siteItems.length > 0) {
+    if (siteItems.length) {
       this._removeSiteItems(siteItems);
     }
   },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/content/autocomplete-popup.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/content/autocomplete-popup.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/content/autocomplete-popup.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/content/autocomplete-popup.js	2019-09-15 11:33:06.000000000 +0000
@@ -212,23 +212,28 @@
       }
     }
 
-    updateHeader() {
-      Services.search.getDefault().then(currentEngine => {
-        let uri = currentEngine.iconURI;
-        if (uri) {
-          this.setAttribute("src", uri.spec);
-        } else {
-          // If the default has just been changed to a provider without icon,
-          // avoid showing the icon of the previous default provider.
-          this.removeAttribute("src");
-        }
+    async updateHeader() {
+      let currentEngine;
+      if (PrivateBrowsingUtils.isWindowPrivate(window)) {
+        currentEngine = await Services.search.getDefaultPrivate();
+      } else {
+        currentEngine = await Services.search.getDefault();
+      }
+
+      let uri = currentEngine.iconURI;
+      if (uri) {
+        this.setAttribute("src", uri.spec);
+      } else {
+        // If the default has just been changed to a provider without icon,
+        // avoid showing the icon of the previous default provider.
+        this.removeAttribute("src");
+      }
 
-        let headerText = this.bundle.formatStringFromName("searchHeader", [
-          currentEngine.name,
-        ]);
-        this.searchbarEngineName.setAttribute("value", headerText);
-        this.searchbarEngine.engine = currentEngine;
-      });
+      let headerText = this.bundle.formatStringFromName("searchHeader", [
+        currentEngine.name,
+      ]);
+      this.searchbarEngineName.setAttribute("value", headerText);
+      this.searchbarEngine.engine = currentEngine;
     }
 
     /**
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/content/searchbar.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/content/searchbar.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/content/searchbar.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/content/searchbar.js	2019-09-15 11:33:06.000000000 +0000
@@ -145,12 +145,21 @@
     }
 
     set currentEngine(val) {
-      Services.search.defaultEngine = val;
+      if (PrivateBrowsingUtils.isWindowPrivate(window)) {
+        Services.search.defaultPrivateEngine = val;
+      } else {
+        Services.search.defaultEngine = val;
+      }
       return val;
     }
 
     get currentEngine() {
-      let currentEngine = Services.search.defaultEngine;
+      let currentEngine;
+      if (PrivateBrowsingUtils.isWindowPrivate(window)) {
+        currentEngine = Services.search.defaultPrivateEngine;
+      } else {
+        currentEngine = Services.search.defaultEngine;
+      }
       // Return a dummy engine if there is no currentEngine
       return currentEngine || { name: "", uri: null };
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/content/search-one-offs.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/content/search-one-offs.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/content/search-one-offs.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/content/search-one-offs.js	2019-09-15 11:33:06.000000000 +0000
@@ -19,17 +19,19 @@
       MozXULElement.parseXULToFragment(
         `
       <hbox class="search-panel-one-offs-header search-panel-header search-panel-current-input">
-        <label class="searchbar-oneoffheader-search" value="&searchWithDesc.label;"/>
+        <label class="search-panel-one-offs-header-label" value="&searchWithDesc.label;"/>
       </hbox>
       <hbox class="search-panel-one-offs" role="group"/>
       <vbox class="search-add-engines"/>
       <hbox class="search-one-offs-spacer"/>
       <button class="searchbar-engine-one-off-item search-setting-button-compact" tooltiptext="&changeSearchSettings.tooltip;"/>
       <button class="search-setting-button" label="&changeSearchSettings.button;"/>
-      <menupopup class="search-one-offs-context-menu">
-        <menuitem class="search-one-offs-context-open-in-new-tab" label="&searchInNewTab.label;" accesskey="&searchInNewTab.accesskey;"/>
-        <menuitem class="search-one-offs-context-set-default" label="&searchSetAsDefault.label;" accesskey="&searchSetAsDefault.accesskey;"/>
-      </menupopup>
+      <box style="visibiltiy:collapse">
+        <menupopup class="search-one-offs-context-menu">
+          <menuitem class="search-one-offs-context-open-in-new-tab" label="&searchInNewTab.label;" accesskey="&searchInNewTab.accesskey;"/>
+          <menuitem class="search-one-offs-context-set-default" label="&searchSetAsDefault.label;" accesskey="&searchSetAsDefault.accesskey;"/>
+        </menupopup>
+      </box>
       `,
         ["chrome://browser/locale/browser.dtd"]
       )
@@ -354,11 +356,17 @@
   }
 
   get selectedAutocompleteIndex() {
-    return (this._view || this.popup).selectedIndex;
+    if (!this.compact) {
+      return this.popup.selectedIndex;
+    }
+    return this._view.selectedRowIndex;
   }
 
   set selectedAutocompleteIndex(val) {
-    return ((this._view || this.popup).selectedIndex = val);
+    if (!this.compact) {
+      return (this.popup.selectedIndex = val);
+    }
+    return (this._view.selectedRowIndex = val);
   }
 
   get compact() {
@@ -379,7 +387,12 @@
     }
     let currentEngineNameToIgnore;
     if (!this.getAttribute("includecurrentengine")) {
-      currentEngineNameToIgnore = (await Services.search.getDefault()).name;
+      if (PrivateBrowsingUtils.isWindowPrivate(window)) {
+        currentEngineNameToIgnore = (await Services.search.getDefaultPrivate())
+          .name;
+      } else {
+        currentEngineNameToIgnore = (await Services.search.getDefault()).name;
+      }
     }
 
     let pref = Services.prefs.getStringPref("browser.search.hiddenOneOffs");
@@ -454,12 +467,14 @@
     }
 
     let headerText = this.header.querySelector(
-      ".searchbar-oneoffheader-search"
+      ".search-panel-one-offs-header-label"
     );
     this.buttons.setAttribute("aria-label", headerText.value);
 
     let engines = await this.getEngines();
-    let defaultEngine = await Services.search.getDefault();
+    let defaultEngine = PrivateBrowsingUtils.isWindowPrivate(window)
+      ? await Services.search.getDefaultPrivate()
+      : await Services.search.getDefault();
     let oneOffCount = engines.length;
     let hideOneOffs =
       !oneOffCount ||
@@ -1163,7 +1178,10 @@
     }
 
     if (target.classList.contains("search-one-offs-context-set-default")) {
-      let currentEngine = Services.search.defaultEngine;
+      const engineType = PrivateBrowsingUtils.isWindowPrivate(window)
+        ? "defaultPrivateEngine"
+        : "defaultEngine";
+      let currentEngine = Services.search[engineType];
 
       if (!this.getAttribute("includecurrentengine")) {
         // Make the target button of the context menu reflect the current
@@ -1180,7 +1198,7 @@
         button.engine = currentEngine;
       }
 
-      Services.search.defaultEngine = this._contextEngine;
+      Services.search[engineType] = this._contextEngine;
     }
   }
 
@@ -1194,10 +1212,9 @@
       event.preventDefault();
       return;
     }
-    this.querySelector(".search-one-offs-context-set-default").setAttribute(
-      "disabled",
-      target.engine == Services.search.defaultEngine
-    );
+    this.contextMenuPopup
+      .querySelector(".search-one-offs-context-set-default")
+      .setAttribute("disabled", target.engine == Services.search.defaultEngine);
 
     this.contextMenuPopup.openPopupAtScreen(event.screenX, event.screenY, true);
     event.preventDefault();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/extensions/engines.json firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/extensions/engines.json
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/extensions/engines.json	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/extensions/engines.json	2019-09-15 11:33:06.000000000 +0000
@@ -40,8 +40,8 @@
         "included": {
           "locales": {
             "matches": [
-              "ach", "af", "an", "ar", "ast", "az", "ca", "cak", "da", "de",
-              "dsb", "el", "eo", "es-CL", "es-ES",
+              "ach", "af", "an", "ar", "ast", "az", "ca", "ca-valencia",
+              "cak", "da", "de", "dsb", "el", "eo", "es-CL", "es-ES",
               "es-MX", "eu", "fa", "ff", "fi", "fr", "fy-NL", "gn",
               "gu-IN", "hi-IN", "hr", "hsb", "ia", "is", "it",
               "ja-JP-mac", "ja", "ka", "kab", "km", "kn", "lij", "lo",
@@ -101,7 +101,7 @@
         },
         "webExtensionId": "amazon@search.mozilla.org",
         "webExtensionVersion": "1.1",
-        "webExtensionLocale": "au",
+        "webExtensionLocales": ["au"],
         "engineName": "Amazon.com.au"
       }, {
         "included": {
@@ -117,7 +117,7 @@
         },
         "webExtensionId": "amazon@search.mozilla.org",
         "webExtensionVersion": "1.1",
-        "webExtensionLocale": "ca",
+        "webExtensionLocales": ["ca"],
         "engineName": "Amazon.ca"
       }, {
         "included": {
@@ -133,7 +133,7 @@
         },
         "webExtensionId": "amazon@search.mozilla.org",
         "webExtensionVersion": "1.1",
-        "webExtensionLocale": "france",
+        "webExtensionLocales": ["france"],
         "engineName": "Amazon.fr"
       }, {
         "included": {
@@ -149,7 +149,7 @@
         },
         "webExtensionId": "amazon@search.mozilla.org",
         "webExtensionVersion": "1.1",
-        "webExtensionLocale": "en-GB",
+        "webExtensionLocales": ["en-GB"],
         "engineName": "Amazon.co.uk"
       }],
       "aliases": ["amazon"]
@@ -166,36 +166,36 @@
             "or", "pa-IN", "ta", "te", "ur"
           ]}
         },
-        "webExtensionLocale": "in",
+        "webExtensionLocales": ["in"],
         "engineName": "Amazon.in"
       }, {
         "included": {
           "locales": { "matches": ["br", "ff", "fr", "son", "wo"] }
         },
-        "webExtensionLocale": "france",
+        "webExtensionLocales": ["france"],
         "engineName": "Amazon.fr"
       }, {
         "included": {
           "regions": ["ca"],
           "locales": { "matches": ["br", "ff", "fr", "son", "wo"] }
         },
-        "webExtensionLocale": "ca",
+        "webExtensionLocales": ["ca"],
         "engineName": "Amazon.ca"
       }, {
         "included": { "locales": { "matches": ["en-CA"] } },
-        "webExtensionLocale": "ca",
+        "webExtensionLocales": ["ca"],
         "engineName": "Amazon.ca"
       }, {
         "included": { "locales": { "matches": ["ja-JP-mac", "ja"] } },
-        "webExtensionLocale": "jp",
+        "webExtensionLocales": ["jp"],
         "engineName": "Amazon.jp"
       }, {
         "included": { "locales": { "matches": ["it", "lij"] } },
-        "webExtensionLocale": "it",
+        "webExtensionLocales": ["it"],
         "engineName": "Amazon.it"
       }, {
         "included": { "locales": { "matches": ["de", "dsb", "hsb"] } },
-        "webExtensionLocale": "de",
+        "webExtensionLocales": ["de"],
         "engineName": "Amazon.de"
       }, {
         "included": {
@@ -206,7 +206,7 @@
             ]
           }
         },
-        "webExtensionLocale": "en-GB",
+        "webExtensionLocales": ["en-GB"],
         "engineName": "Amazon.co.uk"
       }, {
         "included": {
@@ -218,7 +218,7 @@
             ]
           }
         },
-        "webExtensionLocale": "au",
+        "webExtensionLocales": ["au"],
         "engineName": "Amazon.au"
       }],
       "aliases": ["amazon"]
@@ -246,96 +246,96 @@
           "locales": { "matches": ["en-US"] },
           "regions": ["au"]
         },
-        "webExtensionLocale": "au"
+        "webExtensionLocales": ["au"]
       }, {
         "included": {
           "locales": { "matches": ["en-US"] },
           "regions": ["ie"]
         },
-        "webExtensionLocale": "ie"
+        "webExtensionLocales": ["ie"]
       }, {
         "included": {
           "locales": { "matches": ["en-US"] },
           "regions": ["be"]
         },
-        "webExtensionLocale": "be"
+        "webExtensionLocales": ["be"]
       }, {
         "included": { "locales": {
-          "matches": ["an", "ast", "ca", "es-ES", "eu", "gl"]
+          "matches": ["an", "ast", "ca", "ca-valencia", "es-ES", "eu", "gl"]
         }},
-        "webExtensionLocale": "es"
+        "webExtensionLocales": ["es"]
       }, {
         "included": { "locales": { "matches": ["br", "fr", "wo"] }},
-        "webExtensionLocale": "fr"
+        "webExtensionLocales": ["fr"]
       }, {
         "included": {
           "locales": { "matches": ["br", "fr", "wo"] },
           "regions": ["be"]
         },
-        "webExtensionLocale": "be"
+        "webExtensionLocales": ["be"]
       }, {
         "included": {
           "locales": { "matches": ["br", "fr", "wo"] },
           "regions": ["ca"]
         },
-        "webExtensionLocale": "ca"
+        "webExtensionLocales": ["ca"]
       }, {
         "included": {
           "locales": { "matches": ["br", "fr", "wo"] },
           "regions": ["ch"]
         },
-        "webExtensionLocale": "ch"
+        "webExtensionLocales": ["ch"]
       }, {
         "included": { "locales": { "matches": ["cy", "en-GB", "gd"] }},
-        "webExtensionLocale": "uk"
+        "webExtensionLocales": ["uk"]
       }, {
         "included": {
           "locales": { "matches": ["cy", "en-GB", "gd"] },
           "regions": ["au"]
         },
-        "webExtensionLocale": "au"
+        "webExtensionLocales": ["au"]
       }, {
         "included": {
           "locales": { "matches": ["cy", "en-GB", "gd"] },
           "regions": ["ie"]
         },
-        "webExtensionLocale": "ie"
+        "webExtensionLocales": ["ie"]
       }, {
         "included": { "locales": { "matches": ["de", "dsb", "hsb"] }},
-        "webExtensionLocale": "de"
+        "webExtensionLocales": ["de"]
       }, {
         "included": {
           "locales": { "matches": ["de", "dsb", "hsb"] },
           "regions": ["at"]
         },
-        "webExtensionLocale": "at"
+        "webExtensionLocales": ["at"]
       }, {
         "included": {
           "locales": { "matches": ["de", "dsb", "hsb"] },
           "regions": ["ch"]
         },
-        "webExtensionLocale": "ch"
+        "webExtensionLocales": ["ch"]
       }, {
         "included": { "locales": { "matches": ["en-CA"] }},
-        "webExtensionLocale": "ca"
+        "webExtensionLocales": ["ca"]
       }, {
         "included": { "locales": { "matches": ["fy-NL", "nl"] }},
-        "webExtensionLocale": "nl"
+        "webExtensionLocales": ["nl"]
       }, {
         "included": {
           "locales": { "matches": ["fy-NL", "nl"] },
           "regions": ["be"]
         },
-        "webExtensionLocale": "be"
+        "webExtensionLocales": ["be"]
       }, {
         "included": { "locales": { "matches": ["ga-IE"] }},
-        "webExtensionLocale": "ie"
+        "webExtensionLocales": ["ie"]
       }, {
         "included": { "locales": { "matches": ["it", "lij"] }},
-        "webExtensionLocale": "it"
+        "webExtensionLocales": ["it"]
       }, {
         "included": { "locales": { "matches": ["rm"] }},
-        "webExtensionLocale": "ch"
+        "webExtensionLocales": ["ch"]
       }],
       "aliases": ["@ebay"]
     },
@@ -362,25 +362,25 @@
             "startsWith": ["en"]
           }
         },
-        "webExtensionLocale": "en"
+        "webExtensionLocales": ["en"]
       }, {
         "included": { "locales": { "matches": ["az"] }},
-        "webExtensionLocale": "az"
+        "webExtensionLocales": ["az"]
       }, {
         "included": { "locales": { "matches": ["be"] }},
-        "webExtensionLocale": "by",
+        "webExtensionLocales": ["by"],
         "engineName": "\u044F\u043D\u0434\u0435\u043A\u0441"
       }, {
         "included": { "locales": { "matches": ["kk"] }},
-        "webExtensionLocale": "kk",
+        "webExtensionLocales": ["kk"],
         "engineName": "\u044F\u043D\u0434\u0435\u043A\u0441"
       }, {
         "included": { "locales": { "matches": ["ru"] }},
-        "webExtensionLocale": "ru",
+        "webExtensionLocales": ["ru"],
         "engineName": "\u044F\u043D\u0434\u0435\u043A\u0441"
       }, {
         "included": { "locales": { "matches": ["tr"] }},
-        "webExtensionLocale": "tr"
+        "webExtensionLocales": ["tr"]
       }],
       "aliases": ["@\u044F\u043D\u0434\u0435\u043A\u0441", "@yandex"]
     },
@@ -434,10 +434,10 @@
       "webExtensionVersion": "1.0",
       "appliesTo": [{
         "included": { "locales": { "matches": ["fy-NL"]}},
-        "webExtensionLocale": "fy-NL"
+        "webExtensionLocales": ["fy-NL"]
       }, {
         "included": { "locales": { "matches": ["nl"]}},
-        "webExtensionLocale": "nl"
+        "webExtensionLocales": ["nl"]
       }]
     },
     {
@@ -468,7 +468,8 @@
       "engineName": "diec2",
       "webExtensionId": "diec2@search.mozilla.org",
       "webExtensionVersion": "1.2",
-      "appliesTo": [{ "included": { "locales": { "matches": ["ca"]}}}]
+      "appliesTo": [{
+        "included": { "locales": { "matches": ["ca", "ca-valencia"]}}}]
     },
     {
       "engineName": "drae",
@@ -574,10 +575,10 @@
       "webExtensionVersion": "1.0",
       "appliesTo": [{
         "included": { "locales": { "matches": ["fy-NL"]}},
-        "webExtensionLocale": "fy-NL"
+        "webExtensionLocales": ["fy-NL"]
       }, {
         "included": { "locales": { "matches": ["nl"]}},
-        "webExtensionLocale": "nl"
+        "webExtensionLocales": ["nl"]
       }]
     },
     {
@@ -586,13 +587,13 @@
       "webExtensionVersion": "1.0",
       "appliesTo": [{
         "included": { "locales": { "matches": ["es-AR"]}},
-        "webExtensionLocale": "ar"
+        "webExtensionLocales": ["ar"]
       }, {
         "included": { "locales": { "matches": ["es-CL"]}},
-        "webExtensionLocale": "cl"
+        "webExtensionLocales": ["cl"]
       }, {
         "included": { "locales": { "matches": ["es-MX"]}},
-        "webExtensionLocale": "mx"
+        "webExtensionLocales": ["mx"]
       }]
     },
     {
@@ -751,14 +752,14 @@
       "webExtensionVersion": "1.0",
       "appliesTo": [{
         "included": { "locales": { "matches": [
-          "en-US", "ach", "an", "bs", "ca", "crh", "en-CA", "ga-IE",
-          "gn", "hr", "ia", "ka", "kk", "km", "lo", "lt", "mai",
-          "ms", "my", "ne-NP", "oc", "pt-BR", "sl", "tl", "tr",
-          "ur", "uz", "wo"
+          "en-US", "ach", "an", "bs", "ca", "ca-valencia", "crh",
+          "en-CA", "ga-IE", "gn", "hr", "ia", "ka", "kk", "km", "lo",
+          "lt", "mai",  "ms", "my", "ne-NP", "oc", "pt-BR", "sl", "tl",
+          "tr", "ur", "uz", "wo"
         ]}}
       }, {
         "included": { "locales": { "matches": ["ja-JP-mac", "ja"]}},
-        "webExtensionLocale": "ja"
+        "webExtensionLocales": ["ja"]
       }]
     },
     {
@@ -779,10 +780,10 @@
       "webExtensionVersion": "1.0",
       "appliesTo": [{
         "included": { "locales": { "matches": ["te"]}},
-        "webExtensionLocale": "te"
+        "webExtensionLocales": ["te"]
       }, {
         "included": { "locales": { "matches": ["oc"]}},
-        "webExtensionLocale": "oc"
+        "webExtensionLocales": ["oc"]
       }]
     },
     {
@@ -816,7 +817,7 @@
       "appliesTo": [ {
         "included": { "locales": { "matches": [
           "af", "an", "ar", "as", "ast", "az", "be", "bg",
-          "br", "bs", "ca", "crh", "cy", "da", "de", "dsb",
+          "br", "bs", "crh", "cy", "da", "de", "dsb",
           "el", "eo", "et", "eu", "fa", "fi", "fy-NL", "ga-IE",
           "gd", "gl", "gn", "he", "hr", "hsb", "hu", "ia",
           "id", "is", "it", "ka", "kab", "kk", "km", "kn",
@@ -826,59 +827,68 @@
           "th", "tl", "tr", "uk", "ur", "uz", "vi", "wo",
           "zh-CN", "zh-TW"
         ]}},
-        "webExtensionLocale": "$USER_LOCALE"
+        "webExtensionLocales": ["$USER_LOCALE"]
       }, {
         "included": { "locales": { "matches": [
           "en-CA", "en-GB", "en-US", "en-ZA", "ach", "xh"
           ]}},
-          "webExtensionLocale": "en"
+          "webExtensionLocales": ["en"]
+      }, {
+        "included": { "locales": { "matches": [ "be" ] } },
+        "webExtensionLocales": ["be", "be-tarask"]
       }, {
         "included": { "locales": { "matches": [ "bn", "bn-BD", "bn-IN" ] } },
-        "webExtensionLocale": "bn"
+        "webExtensionLocales": ["bn"]
+      }, {
+        "included": { "locales": { "matches": [ "ca", "ca-valencia" ] } },
+        "webExtensionLocale": "ca"
       }, {
         "included": { "locales": { "matches": [
           "cak", "es-AR", "es-CL", "es-ES", "es-MX", "trs"
         ]}},
-        "webExtensionLocale": "es"
+        "webExtensionLocales": ["es"]
       }, {
         "included": { "locales": { "matches": [ "cs" ] } },
-        "webExtensionLocale": "cz"
+        "webExtensionLocales": ["cz"]
       }, {
         "included": { "locales": { "matches": [ "ff", "fr", "son" ] } },
-        "webExtensionLocale": "fr"
+        "webExtensionLocales": ["fr"]
       }, {
         "included": { "locales": { "matches": [ "gu-IN" ] } },
-        "webExtensionLocale": "gu"
+        "webExtensionLocales": ["gu"]
       }, {
         "included": { "locales": { "matches": [ "hi-IN" ] } },
-        "webExtensionLocale": "hi"
+        "webExtensionLocales": ["hi"]
       }, {
         "included": { "locales": { "matches": [ "hy-AM" ] } },
-        "webExtensionLocale": "hy"
+        "webExtensionLocales": ["hy"]
       }, {
         "included": { "locales": { "matches": [ "ja-JP-macos", "ja" ] } },
-        "webExtensionLocale": "ja"
+        "webExtensionLocales": ["ja"]
       }, {
         "included": { "locales": { "matches": [ "ko" ] } },
-        "webExtensionLocale": "kr"
+        "webExtensionLocales": ["kr"]
       }, {
         "included": { "locales": { "matches": [ "mai" ] } },
-        "webExtensionLocale": "hi"
+        "webExtensionLocales": ["hi"]
+      }, {
+        "included": { "locales": { "matches": [ "ml" ] } },
+        "webExtensionLocales": ["en", "ml"]
       }, {
         "included": { "locales": { "matches": [ "nb-NO" ] } },
-        "webExtensionLocale": "NO"
+        "webExtensionLocales": ["NO"]
       }, {
         "included": { "locales": { "matches": [ "ne-NP" ] } },
-        "webExtensionLocale": "ne"
+        "webExtensionLocales": ["ne"]
       }, {
         "included": { "locales": { "matches": [ "nn-NO" ] } },
-        "webExtensionLocale": "NN"
+        "webExtensionLocales": ["NN"]
       }, {
         "included": { "locales": { "matches": [ "pa-IN" ] } },
-        "webExtensionLocale": "pa"
+        "webExtensionLocales": ["pa"]
       }, {
         "included": { "locales": { "matches": [ "pt-BR", "pt-PT" ] } },
-        "webExtensionLocale": "pt"
+        "webExtensionLocales": ["pt"]
       }]
     }
   ]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/extensions/list.json firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/extensions/list.json
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/extensions/list.json	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/extensions/list.json	2019-09-15 11:33:06.000000000 +0000
@@ -204,6 +204,13 @@
         ]
       }
     },
+    "ca-valencia": {
+      "default": {
+        "visibleDefaultEngines": [
+          "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca"
+        ]
+      }
+    },
     "cak": {
       "default": {
         "visibleDefaultEngines": [
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/test/browser/browser.ini firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/test/browser/browser.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/test/browser/browser.ini	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/test/browser/browser.ini	2019-09-15 11:33:06.000000000 +0000
@@ -40,6 +40,7 @@
 [browser_oneOffContextMenu.js]
 [browser_oneOffContextMenu_setDefault.js]
 [browser_private_search_perwindowpb.js]
+[browser_searchbar_default.js]
 [browser_searchbar_openpopup.js]
 skip-if = os == "linux" # Linux has different focus behaviours.
 [browser_searchbar_keyboard_navigation.js]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/test/browser/browser_searchbar_default.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/test/browser/browser_searchbar_default.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/test/browser/browser_searchbar_default.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/test/browser/browser_searchbar_default.js	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,134 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+/*
+ * Tests the correct default engines in the search bar.
+ */
+
+"use strict";
+
+const templateNormal = "https://example.com/?q=";
+const templatePrivate = "https://example.com/?query=";
+
+async function searchInSearchbar(win, inputText) {
+  await new Promise(r => waitForFocus(r, win));
+  let searchbar = win.BrowserSearch.searchBar;
+  // Write the search query in the searchbar.
+  searchbar.focus();
+  searchbar.value = inputText;
+  searchbar.textbox.controller.startSearch(inputText);
+  // Wait for the popup to show.
+  await BrowserTestUtils.waitForEvent(searchbar.textbox.popup, "popupshown");
+  // And then for the search to complete.
+  await BrowserTestUtils.waitForCondition(
+    () =>
+      searchbar.textbox.controller.searchStatus >=
+      Ci.nsIAutoCompleteController.STATUS_COMPLETE_NO_MATCH,
+    "The search in the searchbar must complete."
+  );
+}
+
+add_task(async function setup() {
+  await gCUITestUtils.addSearchBar();
+
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.search.separatePrivateDefault", false]],
+  });
+
+  // Create two new search engines. Mark one as the default engine, so
+  // the test don't crash. We need to engines for this test as the searchbar
+  // doesn't display the default search engine among the one-off engines.
+  await Services.search.addEngineWithDetails("MozSearch1", {
+    alias: "mozalias",
+    method: "GET",
+    template: templateNormal + "{searchTerms}",
+  });
+
+  await Services.search.addEngineWithDetails("MozSearch2", {
+    alias: "mozalias2",
+    method: "GET",
+    template: templatePrivate + "{searchTerms}",
+  });
+
+  let originalEngine = await Services.search.getDefault();
+  let originalPrivateEngine = await Services.search.getDefaultPrivate();
+
+  let engineDefault = Services.search.getEngineByName("MozSearch1");
+  await Services.search.setDefault(engineDefault);
+
+  let engineOneOff = Services.search.getEngineByName("MozSearch2");
+
+  registerCleanupFunction(async function() {
+    gCUITestUtils.removeSearchBar();
+    await Services.search.setDefault(originalEngine);
+    await Services.search.setDefaultPrivate(originalPrivateEngine);
+    await Services.search.removeEngine(engineDefault);
+    await Services.search.removeEngine(engineOneOff);
+  });
+});
+
+async function doSearch(win, tab, engineName, expectedUrl) {
+  await searchInSearchbar(win, "query");
+
+  Assert.ok(
+    win.BrowserSearch.searchBar.textbox.popup.searchbarEngineName
+      .getAttribute("value")
+      .includes(engineName),
+    "Should have the correct engine name displayed in the bar"
+  );
+
+  let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
+  EventUtils.synthesizeKey("KEY_Enter", {}, win);
+  await p;
+
+  Assert.equal(
+    tab.linkedBrowser.currentURI.spec,
+    expectedUrl,
+    "Should have loaded the expected search page."
+  );
+}
+
+add_task(async function test_default_search() {
+  const tab = await BrowserTestUtils.openNewForegroundTab(
+    gBrowser,
+    "about:blank"
+  );
+
+  await doSearch(window, tab, "MozSearch1", templateNormal + "query");
+
+  BrowserTestUtils.removeTab(tab);
+});
+
+add_task(async function test_default_search_private_no_separate() {
+  const win = await BrowserTestUtils.openNewBrowserWindow({ private: true });
+
+  await doSearch(
+    win,
+    win.gBrowser.selectedTab,
+    "MozSearch1",
+    templateNormal + "query"
+  );
+
+  await BrowserTestUtils.closeWindow(win);
+});
+
+add_task(async function test_default_search_private_no_separate() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["browser.search.separatePrivateDefault", true]],
+  });
+
+  await Services.search.setDefaultPrivate(
+    Services.search.getEngineByName("MozSearch2")
+  );
+
+  const win = await BrowserTestUtils.openNewBrowserWindow({ private: true });
+
+  await doSearch(
+    win,
+    win.gBrowser.selectedTab,
+    "MozSearch2",
+    templatePrivate + "query"
+  );
+
+  await BrowserTestUtils.closeWindow(win);
+});
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/test/browser/browser_searchTelemetry.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/test/browser/browser_searchTelemetry.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/search/test/browser/browser_searchTelemetry.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/search/test/browser/browser_searchTelemetry.js	2019-09-15 11:33:06.000000000 +0000
@@ -55,7 +55,7 @@
     );
   }, "should have the correct number of histograms");
 
-  if (Object.entries(expectedScalars).length > 0) {
+  if (Object.entries(expectedScalars).length) {
     await TestUtils.waitForCondition(() => {
       scalars =
         Services.telemetry.getSnapshotForKeyedScalars("main", false).parent ||
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/sessionstore/RecentlyClosedTabsAndWindowsMenuUtils.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -92,7 +92,7 @@
     let closedWindowData = SessionStore.getClosedWindowData(false);
     let doc = aWindow.document;
     let fragment = doc.createDocumentFragment();
-    if (closedWindowData.length != 0) {
+    if (closedWindowData.length) {
       let menuLabelString = navigatorBundle.GetStringFromName(
         "menuUndoCloseWindowLabel"
       );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/sessionstore/SessionStore.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/sessionstore/SessionStore.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/sessionstore/SessionStore.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/sessionstore/SessionStore.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -2069,7 +2069,7 @@
           }
         }
       }
-      if (openTabs.length == 0) {
+      if (!openTabs.length) {
         this._closedWindows.splice(ix, 1);
       } else if (openTabs.length != openTabCount) {
         // Adjust the window's title if we removed an open tab
@@ -3822,7 +3822,7 @@
     var hidden = WINDOW_HIDEABLE_FEATURES.filter(function(aItem) {
       return aWindow[aItem] && !aWindow[aItem].visible;
     });
-    if (hidden.length != 0) {
+    if (hidden.length) {
       winData.hidden = hidden.join(",");
     } else if (winData.hidden) {
       delete winData.hidden;
@@ -3913,14 +3913,14 @@
       //        its own check for popups. c.f. bug 597619
       if (
         nonPopupCount == 0 &&
-        lastClosedWindowsCopy.length > 0 &&
+        !!lastClosedWindowsCopy.length &&
         RunState.isQuitting
       ) {
         // prepend the last non-popup browser window, so that if the user loads more tabs
         // at startup we don't accidentally add them to a popup window
         do {
           total.unshift(lastClosedWindowsCopy.shift());
-        } while (total[0].isPopup && lastClosedWindowsCopy.length > 0);
+        } while (total[0].isPopup && lastClosedWindowsCopy.length);
       }
     }
 
@@ -4085,7 +4085,7 @@
       firstWindow &&
       !overwriteTabs &&
       winData.tabs.length == 1 &&
-      (!winData.tabs[0].entries || winData.tabs[0].entries.length == 0)
+      (!winData.tabs[0].entries || !winData.tabs[0].entries.length)
     ) {
       winData.tabs = [];
     }
@@ -5299,7 +5299,7 @@
 
     // don't display the page when there's nothing to restore
     let winData = aState.windows || null;
-    if (!winData || winData.length == 0) {
+    if (!winData || !winData.length) {
       return false;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/sessionstore/test/browser_393716.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/sessionstore/test/browser_393716.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/sessionstore/test/browser_393716.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/sessionstore/test/browser_393716.js	2019-09-15 11:33:06.000000000 +0000
@@ -37,7 +37,7 @@
   ok(
     state instanceof Object &&
       state.entries instanceof Array &&
-      state.entries.length > 0,
+      !!state.entries.length,
     "state object seems valid"
   );
   ok(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/sessionstore/test/browser_background_tab_crash.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/sessionstore/test/browser_background_tab_crash.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/sessionstore/test/browser_background_tab_crash.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/sessionstore/test/browser_background_tab_crash.js	2019-09-15 11:33:06.000000000 +0000
@@ -80,7 +80,7 @@
  *        background state.
  */
 async function crashBackgroundTabs(tabs) {
-  Assert.ok(tabs.length > 0, "Need to crash at least one tab.");
+  Assert.ok(!!tabs.length, "Need to crash at least one tab.");
   for (let tab of tabs) {
     Assert.ok(tab.linkedBrowser.isRemoteBrowser, "tab is remote");
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/syncedtabs/TabListView.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/syncedtabs/TabListView.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/syncedtabs/TabListView.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/syncedtabs/TabListView.js	2019-09-15 11:33:06.000000000 +0000
@@ -580,7 +580,7 @@
         }
       } else if (el.getAttribute("id") == "syncedTabsOpenAllInTabs") {
         const tabs = item.querySelectorAll(".item-tabs-list > .item.tab");
-        show = tabs.length > 0;
+        show = !!tabs.length;
       } else if (el.getAttribute("id") == "syncedTabsRefresh") {
         show = true;
       } else if (el.getAttribute("id") == "syncedTabsManageDevices") {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/translation/TranslationDocument.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/translation/TranslationDocument.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/translation/TranslationDocument.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/translation/TranslationDocument.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -72,7 +72,7 @@
     // we are able to reduce their data payload sent to the translation service.
 
     for (let root of this.roots) {
-      if (root.children.length == 0 && root.nodeRef.childElementCount == 0) {
+      if (!root.children.length && root.nodeRef.childElementCount == 0) {
         root.isSimpleRoot = true;
       }
     }
@@ -497,7 +497,7 @@
   // Let's start the process by adding the root item.
   let visitStack = [item];
 
-  while (visitStack.length > 0) {
+  while (visitStack.length) {
     let curItem = visitStack.shift();
 
     let domNode = curItem.nodeRef;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/uitour/test/head.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/uitour/test/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/uitour/test/head.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/uitour/test/head.js	2019-09-15 11:33:06.000000000 +0000
@@ -534,7 +534,7 @@
 }
 
 function nextTest() {
-  if (tests.length == 0) {
+  if (!tests.length) {
     info("finished tests in this file");
     finish();
     return;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/uitour/UITour.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/uitour/UITour.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/uitour/UITour.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/uitour/UITour.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -416,7 +416,7 @@
             }
 
             let buttons = [];
-            if (Array.isArray(data.buttons) && data.buttons.length > 0) {
+            if (Array.isArray(data.buttons) && data.buttons.length) {
               for (let buttonData of data.buttons) {
                 if (
                   typeof buttonData == "object" &&
@@ -848,7 +848,7 @@
           typeof name != "string" ||
           typeof value != "string" ||
           !name.startsWith("utm_") ||
-          value.length == 0 ||
+          !value.length ||
           !reSimpleString.test(name)
         ) {
           log.warn("_populateCampaignParams: invalid campaign param specified");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_autocomplete_a11y_label.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_autocomplete_a11y_label.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_autocomplete_a11y_label.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_autocomplete_a11y_label.js	2019-09-15 11:33:06.000000000 +0000
@@ -135,5 +135,5 @@
       }
     }
   }
-  Assert.ok(expectedSearches.length == 0);
+  Assert.ok(!expectedSearches.length);
 });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_autocomplete_autoselect.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_autocomplete_autoselect.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_autocomplete_autoselect.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_autocomplete_autoselect.js	2019-09-15 11:33:06.000000000 +0000
@@ -18,13 +18,13 @@
 
 function assertSelected(index) {
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     index,
     "Should have selected the correct item"
   );
   // Also check the "selected" attribute, to ensure it is not a "fake" selection
   // due to binding misbehaviors.
-  let element = UrlbarTestUtils.getSelectedElement(window);
+  let element = UrlbarTestUtils.getSelectedRow(window);
   Assert.ok(
     element.hasAttribute("selected"),
     "Should have the selected attribute on the row element"
@@ -49,7 +49,7 @@
   // This is true because although both the listbox and the one-offs can have
   // selections, the test doesn't check that.
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     -1,
     "A one-off is selected, so the listbox should not have a selection"
   );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_autocomplete_edit_completed.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_autocomplete_edit_completed.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_autocomplete_edit_completed.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_autocomplete_edit_completed.js	2019-09-15 11:33:06.000000000 +0000
@@ -24,7 +24,7 @@
 
   await promiseAutocompleteResultPopup("http://example.com");
 
-  const initialIndex = UrlbarTestUtils.getSelectedIndex(window);
+  const initialIndex = UrlbarTestUtils.getSelectedRowIndex(window);
 
   info("Key Down to select the next item.");
   EventUtils.synthesizeKey("KEY_ArrowDown");
@@ -35,7 +35,7 @@
     nextIndex
   );
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     nextIndex,
     "Should have selected the next item"
   );
@@ -51,7 +51,7 @@
 
   let editedValue = gURLBar.value;
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     initialIndex,
     "Should have selected the initialIndex again"
   );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_autocomplete_readline_navigation.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_autocomplete_readline_navigation.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_autocomplete_readline_navigation.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_autocomplete_readline_navigation.js	2019-09-15 11:33:06.000000000 +0000
@@ -17,7 +17,7 @@
 
 function assertSelected(index) {
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     index,
     "Should have the correct item selected"
   );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_autoFill_preserve.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_autoFill_preserve.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_autoFill_preserve.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_autoFill_preserve.js	2019-09-15 11:33:06.000000000 +0000
@@ -215,7 +215,7 @@
 function checkKeys(testTuples) {
   for (let [key, value, selectedIndex] of testTuples) {
     EventUtils.synthesizeKey(key);
-    Assert.equal(UrlbarTestUtils.getSelectedIndex(window), selectedIndex);
+    Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), selectedIndex);
     Assert.equal(gURLBar.untrimmedValue, value);
   }
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_caret_navigation.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_caret_navigation.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_caret_navigation.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_caret_navigation.js	2019-09-15 11:33:06.000000000 +0000
@@ -76,7 +76,7 @@
     checkIfKeyStartsQuery(key, true);
   });
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     `${key}: Heuristic result should be selected`
   );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_downArrowKeySearch.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_downArrowKeySearch.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_downArrowKeySearch.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_downArrowKeySearch.js	2019-09-15 11:33:06.000000000 +0000
@@ -21,7 +21,7 @@
     gURLBar.selectionStart = gURLBar.untrimmedValue.length;
     EventUtils.synthesizeKey("KEY_ArrowDown");
     await UrlbarTestUtils.promiseSearchComplete(window);
-    Assert.equal(UrlbarTestUtils.getSelectedIndex(window), 0);
+    Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), 0);
     let details = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
     Assert.ok(details.autofill);
     Assert.equal(details.url, "http://example.com/");
@@ -35,7 +35,7 @@
   await UrlbarTestUtils.promisePopupClose(window);
   EventUtils.synthesizeKey("KEY_ArrowDown");
   await UrlbarTestUtils.promiseSearchComplete(window);
-  Assert.equal(UrlbarTestUtils.getSelectedIndex(window), 0);
+  Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), 0);
   let details = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
   Assert.equal(details.type, UrlbarUtils.RESULT_TYPE.SEARCH);
   Assert.ok(details.searchParams);
@@ -49,7 +49,7 @@
   await UrlbarTestUtils.promisePopupClose(window);
   EventUtils.synthesizeKey("KEY_ArrowDown");
   await UrlbarTestUtils.promiseSearchComplete(window);
-  Assert.equal(UrlbarTestUtils.getSelectedIndex(window), -1);
+  Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), -1);
   let details = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
   Assert.equal(details.url, "http://example.com/");
   Assert.equal(gURLBar.value, "");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser.ini firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser.ini	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser.ini	2019-09-15 11:33:06.000000000 +0000
@@ -114,6 +114,7 @@
 support-files =
   moz.png
 [browser_textruns.js]
+[browser_tip_keyboard_selection.js]
 [browser_urlbar_blanking.js]
 support-files =
   file_blank_but_not_blank.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_inputHistory.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_inputHistory.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_inputHistory.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_inputHistory.js	2019-09-15 11:33:06.000000000 +0000
@@ -25,7 +25,7 @@
         EventUtils.synthesizeKey("KEY_ArrowDown");
       }
       if (useMouseClick) {
-        let element = UrlbarTestUtils.getSelectedElement(window);
+        let element = UrlbarTestUtils.getSelectedRow(window);
         EventUtils.synthesizeMouseAtCenter(element, {});
       } else {
         EventUtils.synthesizeKey("KEY_Enter");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_keywordBookmarklets.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_keywordBookmarklets.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_keywordBookmarklets.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_keywordBookmarklets.js	2019-09-15 11:33:06.000000000 +0000
@@ -49,7 +49,7 @@
       await promiseAutocompleteResultPopup("bm");
       let result = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
       Assert.equal(result.title, "javascript:'' ", "Check title");
-      let element = UrlbarTestUtils.getSelectedElement(window);
+      let element = UrlbarTestUtils.getSelectedRow(window);
       EventUtils.synthesizeMouseAtCenter(element, {});
       return "javascript:''%20";
     },
@@ -58,7 +58,7 @@
       await promiseAutocompleteResultPopup("bm a");
       let result = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
       Assert.equal(result.title, "javascript:'a' ", "Check title");
-      let element = UrlbarTestUtils.getSelectedElement(window);
+      let element = UrlbarTestUtils.getSelectedRow(window);
       EventUtils.synthesizeMouseAtCenter(element, {});
       return "javascript:'a'%20";
     },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_keyword_select_and_type.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_keyword_select_and_type.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_keyword_select_and_type.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_keyword_select_and_type.js	2019-09-15 11:33:06.000000000 +0000
@@ -47,7 +47,7 @@
 
   // First item should already be selected
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "Should have the first item selected"
   );
@@ -55,7 +55,7 @@
   // Select next one (important!)
   EventUtils.synthesizeKey("KEY_ArrowDown");
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     1,
     "Should have the second item selected"
   );
@@ -63,7 +63,7 @@
   // Re-select keyword item
   EventUtils.synthesizeKey("KEY_ArrowUp");
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "Should have the first item selected"
   );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_restoreEmptyInput.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_restoreEmptyInput.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_restoreEmptyInput.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_restoreEmptyInput.js	2019-09-15 11:33:06.000000000 +0000
@@ -15,7 +15,7 @@
   await promiseAutocompleteResultPopup("", window, true);
 
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     -1,
     "Nothing selected"
   );
@@ -27,7 +27,7 @@
     EventUtils.synthesizeKey("KEY_ArrowDown");
   }
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     resultCount - 1,
     "Last result selected"
   );
@@ -35,7 +35,7 @@
 
   EventUtils.synthesizeKey("KEY_ArrowDown");
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     -1,
     "Nothing selected"
   );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_selectionKeyNavigation.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_selectionKeyNavigation.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_selectionKeyNavigation.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_selectionKeyNavigation.js	2019-09-15 11:33:06.000000000 +0000
@@ -20,13 +20,13 @@
 add_task(async function downKey() {
   await promiseAutocompleteResultPopup("exam", window, true);
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "The heuristic autofill result should be selected initially"
   );
   for (let i = 1; i < MAX_RESULTS; i++) {
     EventUtils.synthesizeKey("KEY_ArrowDown");
-    Assert.equal(UrlbarTestUtils.getSelectedIndex(window), i);
+    Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), i);
   }
   EventUtils.synthesizeKey("KEY_ArrowDown");
   let oneOffs = UrlbarTestUtils.getOneOffSearchButtons(window);
@@ -35,7 +35,7 @@
     EventUtils.synthesizeKey("KEY_ArrowDown");
   }
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "The heuristic autofill result should be selected again"
   );
@@ -44,7 +44,7 @@
 add_task(async function upKey() {
   await promiseAutocompleteResultPopup("exam", window, true);
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "The heuristic autofill result should be selected initially"
   );
@@ -55,20 +55,23 @@
     EventUtils.synthesizeKey("KEY_ArrowUp");
   }
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     MAX_RESULTS - 1,
     "The last result should be selected"
   );
   for (let i = 1; i < MAX_RESULTS; i++) {
     EventUtils.synthesizeKey("KEY_ArrowUp");
-    Assert.equal(UrlbarTestUtils.getSelectedIndex(window), MAX_RESULTS - i - 1);
+    Assert.equal(
+      UrlbarTestUtils.getSelectedRowIndex(window),
+      MAX_RESULTS - i - 1
+    );
   }
 });
 
 add_task(async function pageDownKey() {
   await promiseAutocompleteResultPopup("exam", window, true);
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "The heuristic autofill result should be selected initially"
   );
@@ -76,13 +79,13 @@
   for (let i = 0; i < pageCount; i++) {
     EventUtils.synthesizeKey("KEY_PageDown");
     Assert.equal(
-      UrlbarTestUtils.getSelectedIndex(window),
+      UrlbarTestUtils.getSelectedRowIndex(window),
       Math.min((i + 1) * UrlbarUtils.PAGE_UP_DOWN_DELTA, MAX_RESULTS - 1)
     );
   }
   EventUtils.synthesizeKey("KEY_PageDown");
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "Page down at end should wrap around to first result"
   );
@@ -91,13 +94,13 @@
 add_task(async function pageUpKey() {
   await promiseAutocompleteResultPopup("exam", window, true);
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "The heuristic autofill result should be selected initially"
   );
   EventUtils.synthesizeKey("KEY_PageUp");
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     MAX_RESULTS - 1,
     "Page up at start should wrap around to last result"
   );
@@ -105,7 +108,7 @@
   for (let i = 0; i < pageCount; i++) {
     EventUtils.synthesizeKey("KEY_PageUp");
     Assert.equal(
-      UrlbarTestUtils.getSelectedIndex(window),
+      UrlbarTestUtils.getSelectedRowIndex(window),
       Math.max(MAX_RESULTS - 1 - (i + 1) * UrlbarUtils.PAGE_UP_DOWN_DELTA, 0)
     );
   }
@@ -117,7 +120,7 @@
   EventUtils.synthesizeKey("KEY_PageDown");
   await UrlbarTestUtils.promiseSearchComplete(window);
   Assert.ok(UrlbarTestUtils.isPopupOpen(window));
-  Assert.equal(UrlbarTestUtils.getSelectedIndex(window), 0);
+  Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), 0);
 });
 
 add_task(async function pageUpKeyShowsView() {
@@ -126,23 +129,23 @@
   EventUtils.synthesizeKey("KEY_PageUp");
   await UrlbarTestUtils.promiseSearchComplete(window);
   Assert.ok(UrlbarTestUtils.isPopupOpen(window));
-  Assert.equal(UrlbarTestUtils.getSelectedIndex(window), 0);
+  Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), 0);
 });
 
 add_task(async function tabKey() {
   await promiseAutocompleteResultPopup("exam", window, true);
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "The heuristic autofill result should be selected initially"
   );
   for (let i = 1; i < MAX_RESULTS; i++) {
     EventUtils.synthesizeKey("KEY_Tab");
-    Assert.equal(UrlbarTestUtils.getSelectedIndex(window), i);
+    Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), i);
   }
   EventUtils.synthesizeKey("KEY_Tab");
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "The heuristic autofill result should be selected again"
   );
@@ -151,13 +154,13 @@
 add_task(async function tabKeyReverse() {
   await promiseAutocompleteResultPopup("exam", window, true);
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     0,
     "The heuristic autofill result should be selected initially"
   );
   for (let i = 1; i < MAX_RESULTS; i++) {
     EventUtils.synthesizeKey("KEY_Tab", { shiftKey: true });
-    Assert.equal(UrlbarTestUtils.getSelectedIndex(window), MAX_RESULTS - i);
+    Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), MAX_RESULTS - i);
   }
 });
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_selectStaleResults.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_selectStaleResults.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_selectStaleResults.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_selectStaleResults.js	2019-09-15 11:33:06.000000000 +0000
@@ -96,7 +96,7 @@
 
   // But there should be maxResults visible rows in the view.
   let items = Array.from(gURLBar.view._rows.children).filter(r =>
-    gURLBar.view._isRowVisible(r)
+    gURLBar.view._isElementVisible(r)
   );
   Assert.equal(items.length, maxResults);
 
@@ -104,20 +104,20 @@
   // result, the stale "x" results should be selected.  We should *not* enter
   // the one-off search buttons at that point.
   for (let i = 1; i < maxResults; i++) {
-    Assert.equal(UrlbarTestUtils.getSelectedIndex(window), i);
+    Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), i);
     let result = await UrlbarTestUtils.getDetailsOfResultAt(window, i);
     Assert.equal(result.element.row.result.uiIndex, i);
     EventUtils.synthesizeKey("KEY_ArrowDown");
   }
 
   // Now the first one-off should be selected.
-  Assert.equal(UrlbarTestUtils.getSelectedIndex(window), -1);
+  Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), -1);
   Assert.equal(gURLBar.view.oneOffSearchButtons.selectedButtonIndex, 0);
 
   // Arrow back up through all the results.
   for (let i = maxResults - 1; i >= 0; i--) {
     EventUtils.synthesizeKey("KEY_ArrowUp");
-    Assert.equal(UrlbarTestUtils.getSelectedIndex(window), i);
+    Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), i);
   }
 
   await UrlbarTestUtils.promisePopupClose(window, () =>
@@ -271,18 +271,18 @@
   // should continue on to "test2".  We should *not* enter the one-off search
   // buttons at that point.
   for (let i = 1; i < maxResults; i++) {
-    Assert.equal(UrlbarTestUtils.getSelectedIndex(window), i);
+    Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), i);
     EventUtils.synthesizeKey("KEY_ArrowDown");
   }
 
   // Now the first one-off should be selected.
-  Assert.equal(UrlbarTestUtils.getSelectedIndex(window), -1);
+  Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), -1);
   Assert.equal(gURLBar.view.oneOffSearchButtons.selectedButtonIndex, 0);
 
   // Arrow back up through all the results.
   for (let i = maxResults - 1; i >= 0; i--) {
     EventUtils.synthesizeKey("KEY_ArrowUp");
-    Assert.equal(UrlbarTestUtils.getSelectedIndex(window), i);
+    Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), i);
   }
 
   await UrlbarTestUtils.promisePopupClose(window, () =>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_switchTab_decodeuri.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_switchTab_decodeuri.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_switchTab_decodeuri.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_switchTab_decodeuri.js	2019-09-15 11:33:06.000000000 +0000
@@ -24,7 +24,7 @@
   EventUtils.synthesizeKey("KEY_ArrowDown");
   let result = await UrlbarTestUtils.getDetailsOfResultAt(
     window,
-    UrlbarTestUtils.getSelectedIndex(window)
+    UrlbarTestUtils.getSelectedRowIndex(window)
   );
   Assert.equal(result.type, UrlbarUtils.RESULT_TYPE.TAB_SWITCH);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_switchTab_override.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_switchTab_override.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_switchTab_override.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_switchTab_override.js	2019-09-15 11:33:06.000000000 +0000
@@ -33,7 +33,7 @@
   EventUtils.synthesizeKey("KEY_ArrowDown");
   let result = await UrlbarTestUtils.getDetailsOfResultAt(
     window,
-    UrlbarTestUtils.getSelectedIndex(window)
+    UrlbarTestUtils.getSelectedRowIndex(window)
   );
   Assert.equal(result.type, UrlbarUtils.RESULT_TYPE.TAB_SWITCH);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_tabMatchesInAwesomebar_perwindowpb.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_tabMatchesInAwesomebar_perwindowpb.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_tabMatchesInAwesomebar_perwindowpb.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_tabMatchesInAwesomebar_perwindowpb.js	2019-09-15 11:33:06.000000000 +0000
@@ -89,7 +89,7 @@
   info(`awesomebar popup appeared. aExpectSwitch: ${aExpectSwitch}`);
   // Make sure the last match is selected.
   while (
-    UrlbarTestUtils.getSelectedIndex(aDestWindow) <
+    UrlbarTestUtils.getSelectedRowIndex(aDestWindow) <
     UrlbarTestUtils.getResultCount(aDestWindow) - 1
   ) {
     info("handling key navigation for DOM_VK_DOWN key");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_tip_keyboard_selection.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_tip_keyboard_selection.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_tip_keyboard_selection.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_tip_keyboard_selection.js	2019-09-15 11:33:06.000000000 +0000
@@ -0,0 +1,232 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+ChromeUtils.defineModuleGetter(
+  this,
+  "UrlbarTestUtils",
+  "resource://testing-common/UrlbarTestUtils.jsm"
+);
+
+XPCOMUtils.defineLazyModuleGetters(this, {
+  UrlbarProvider: "resource:///modules/UrlbarUtils.jsm",
+  UrlbarProvidersManager: "resource:///modules/UrlbarProvidersManager.jsm",
+  UrlbarUtils: "resource:///modules/UrlbarUtils.jsm",
+});
+
+const MEGABAR_PREF = "browser.urlbar.megabar";
+
+// Tests keyboard selection within UrlbarUtils.RESULT_TYPE.TIP results.
+
+/**
+ * A test provider.
+ */
+class TipTestProvider extends UrlbarProvider {
+  constructor(matches) {
+    super();
+    this._matches = matches;
+  }
+  get name() {
+    return "TipTestProvider";
+  }
+  get type() {
+    return UrlbarUtils.PROVIDER_TYPE.PROFILE;
+  }
+  isActive(context) {
+    return true;
+  }
+  isRestricting(context) {
+    return true;
+  }
+  async startQuery(context, addCallback) {
+    Assert.ok(true, "Tip provider was invoked");
+    this._context = context;
+    for (const match of this._matches) {
+      addCallback(this, match);
+    }
+  }
+  cancelQuery(context) {}
+}
+
+add_task(async function tipIsSecondResult() {
+  let matches = [
+    new UrlbarResult(
+      UrlbarUtils.RESULT_TYPE.URL,
+      UrlbarUtils.RESULT_SOURCE.HISTORY,
+      { url: "http://mozilla.org/a" }
+    ),
+    new UrlbarResult(
+      UrlbarUtils.RESULT_TYPE.TIP,
+      UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
+      {
+        icon: "",
+        text: "This is a test intervention.",
+        buttonText: "Done",
+        data: "test",
+        helpUrl:
+          "https://support.mozilla.org/en-US/kb/delete-browsing-search-download-history-firefox",
+      }
+    ),
+    new UrlbarResult(
+      UrlbarUtils.RESULT_TYPE.URL,
+      UrlbarUtils.RESULT_SOURCE.HISTORY,
+      { url: "http://mozilla.org/b" }
+    ),
+    new UrlbarResult(
+      UrlbarUtils.RESULT_TYPE.URL,
+      UrlbarUtils.RESULT_SOURCE.HISTORY,
+      { url: "http://mozilla.org/c" }
+    ),
+  ];
+
+  let provider = new TipTestProvider(matches);
+  UrlbarProvidersManager.registerProvider(provider);
+
+  gURLBar.search("test");
+  await promiseSearchComplete();
+
+  Assert.equal(
+    UrlbarTestUtils.getResultCount(window),
+    4,
+    "There should be four results in the view."
+  );
+  let secondResult = await UrlbarTestUtils.getDetailsOfResultAt(window, 1);
+  Assert.equal(
+    secondResult.type,
+    UrlbarUtils.RESULT_TYPE.TIP,
+    "The second result should be a tip."
+  );
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  Assert.equal(
+    UrlbarTestUtils.getSelectedRowIndex(window),
+    0,
+    "The first result should be selected."
+  );
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  Assert.ok(
+    UrlbarTestUtils.getSelectedElement(window).classList.contains(
+      "urlbarView-tip-button"
+    ),
+    "The selected element should be the tip button."
+  );
+  Assert.equal(
+    UrlbarTestUtils.getSelectedRowIndex(window),
+    1,
+    "getSelectedIndex should return 1 even though the tip button is selected."
+  );
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  Assert.ok(
+    UrlbarTestUtils.getSelectedElement(window).classList.contains(
+      "urlbarView-tip-help"
+    ),
+    "The selected element should be the tip help button."
+  );
+  Assert.equal(
+    UrlbarTestUtils.getSelectedRowIndex(window),
+    1,
+    "getSelectedIndex should return 1 even though the help button is selected."
+  );
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  Assert.equal(
+    UrlbarTestUtils.getSelectedRowIndex(window),
+    2,
+    "The third result should be selected."
+  );
+
+  EventUtils.synthesizeKey("KEY_ArrowUp");
+  Assert.ok(
+    UrlbarTestUtils.getSelectedElement(window).classList.contains(
+      "urlbarView-tip-help"
+    ),
+    "The selected element should be the tip help button."
+  );
+
+  UrlbarProvidersManager.unregisterProvider(provider);
+});
+
+add_task(async function tipIsOnlyResult() {
+  let matches = [
+    new UrlbarResult(
+      UrlbarUtils.RESULT_TYPE.TIP,
+      UrlbarUtils.RESULT_SOURCE.OTHER_LOCAL,
+      {
+        icon: "",
+        text: "This is a test intervention.",
+        buttonText: "Done",
+        data: "test",
+        helpUrl:
+          "https://support.mozilla.org/en-US/kb/delete-browsing-search-download-history-firefox",
+      }
+    ),
+  ];
+
+  // The previous test can interfere with this one if it's in the same window.
+  let newWin = await BrowserTestUtils.openNewBrowserWindow();
+
+  let provider = new TipTestProvider(matches);
+  UrlbarProvidersManager.registerProvider(provider);
+
+  gURLBar.search("test");
+  await promiseSearchComplete();
+
+  Assert.equal(
+    UrlbarTestUtils.getResultCount(window),
+    1,
+    "There should be one result in the view."
+  );
+  let firstResult = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
+  Assert.equal(
+    firstResult.type,
+    UrlbarUtils.RESULT_TYPE.TIP,
+    "The first and only result should be a tip."
+  );
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  Assert.ok(
+    UrlbarTestUtils.getSelectedElement(window).classList.contains(
+      "urlbarView-tip-button"
+    ),
+    "The selected element should be the tip button."
+  );
+  Assert.equal(
+    UrlbarTestUtils.getSelectedRowIndex(window),
+    0,
+    "getSelectedIndex should return 0."
+  );
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  Assert.ok(
+    UrlbarTestUtils.getSelectedElement(window).classList.contains(
+      "urlbarView-tip-help"
+    ),
+    "The selected element should be the tip help button."
+  );
+  Assert.equal(
+    UrlbarTestUtils.getSelectedRowIndex(window),
+    0,
+    "getSelectedIndex should return 0."
+  );
+
+  EventUtils.synthesizeKey("KEY_ArrowDown");
+  Assert.equal(
+    UrlbarTestUtils.getSelectedRowIndex(window),
+    -1,
+    "There should be no selection."
+  );
+
+  EventUtils.synthesizeKey("KEY_ArrowUp");
+  Assert.ok(
+    UrlbarTestUtils.getSelectedElement(window).classList.contains(
+      "urlbarView-tip-help"
+    ),
+    "The selected element should be the tip help button."
+  );
+
+  UrlbarProvidersManager.unregisterProvider(provider);
+  await BrowserTestUtils.closeWindow(newWin);
+});
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbarCopying.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbarCopying.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbarCopying.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbarCopying.js	2019-09-15 11:33:06.000000000 +0000
@@ -241,7 +241,7 @@
 
 function nextTest() {
   let testCase = tests.shift();
-  if (tests.length == 0) {
+  if (!tests.length) {
     runTest(testCase, finish);
   } else {
     runTest(testCase, nextTest);
@@ -292,7 +292,7 @@
       offsets.push([startBracket, endBracket - 1]);
       copyVal = copyVal.replace("<", "").replace(">", "");
     }
-    if (offsets.length == 0 || copyVal != gURLBar.value) {
+    if (!offsets.length || copyVal != gURLBar.value) {
       ok(false, "invalid copyVal: " + copyVal);
     }
     gURLBar.selectionStart = offsets[0][0];
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbarDecode.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbarDecode.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbarDecode.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbarDecode.js	2019-09-15 11:33:06.000000000 +0000
@@ -63,7 +63,7 @@
   // moz-action.
   do {
     EventUtils.synthesizeKey("KEY_ArrowDown");
-  } while (UrlbarTestUtils.getSelectedIndex(window) != 0);
+  } while (UrlbarTestUtils.getSelectedRowIndex(window) != 0);
 
   let result = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbarEnterAfterMouseOver.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbarEnterAfterMouseOver.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbarEnterAfterMouseOver.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbarEnterAfterMouseOver.js	2019-09-15 11:33:06.000000000 +0000
@@ -22,7 +22,7 @@
 
 function assertSelected(index) {
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     index,
     "Should have the correct index selected"
   );
@@ -56,7 +56,7 @@
     "Should have got the correct amount of results"
   );
 
-  let initiallySelected = UrlbarTestUtils.getSelectedIndex(window);
+  let initiallySelected = UrlbarTestUtils.getSelectedRowIndex(window);
 
   info("Key Down to select the next item");
   EventUtils.synthesizeKey("KEY_ArrowDown");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbar_event_telemetry.js	2019-09-15 11:33:06.000000000 +0000
@@ -187,7 +187,7 @@
     while (gURLBar.untrimmedValue != "http://example.com/?q=%s") {
       EventUtils.synthesizeKey("KEY_ArrowDown");
     }
-    let element = UrlbarTestUtils.getSelectedElement(window);
+    let element = UrlbarTestUtils.getSelectedRow(window);
     EventUtils.synthesizeMouseAtCenter(element, {});
     await promise;
     return {
@@ -368,7 +368,7 @@
     while (gURLBar.untrimmedValue != "http://mochi.test:8888/") {
       EventUtils.synthesizeKey("KEY_ArrowDown");
     }
-    let element = UrlbarTestUtils.getSelectedElement(window);
+    let element = UrlbarTestUtils.getSelectedRow(window);
     EventUtils.synthesizeMouseAtCenter(element, {});
     await promise;
     return {
@@ -459,7 +459,7 @@
     while (gURLBar.untrimmedValue != "http://mochi.test:8888/") {
       EventUtils.synthesizeKey("KEY_ArrowDown");
     }
-    let element = UrlbarTestUtils.getSelectedElement(window);
+    let element = UrlbarTestUtils.getSelectedRow(window);
     EventUtils.synthesizeMouseAtCenter(element, {});
     await promise;
     return {
@@ -518,7 +518,7 @@
     });
     Services.prefs.clearUserPref("browser.urlbar.openViewOnFocus");
     await UrlbarTestUtils.promiseSearchComplete(window);
-    let element = UrlbarTestUtils.getSelectedElement(window);
+    let element = UrlbarTestUtils.getSelectedRow(window);
     EventUtils.synthesizeMouseAtCenter(element, {});
     await promise;
     return {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbarOneOffs.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbarOneOffs.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbarOneOffs.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbarOneOffs.js	2019-09-15 11:33:06.000000000 +0000
@@ -257,7 +257,7 @@
 
 function assertState(result, oneOff, textValue = undefined) {
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     result,
     "Expected result should be selected"
   );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbarOneOffs_searchSuggestions.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbarOneOffs_searchSuggestions.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbarOneOffs_searchSuggestions.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbarOneOffs_searchSuggestions.js	2019-09-15 11:33:06.000000000 +0000
@@ -194,7 +194,7 @@
 
 function assertState(result, oneOff, textValue = undefined) {
   Assert.equal(
-    UrlbarTestUtils.getSelectedIndex(window),
+    UrlbarTestUtils.getSelectedRowIndex(window),
     result,
     "Expected result should be selected"
   );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbar_remove_match.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbar_remove_match.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbar_remove_match.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbar_remove_match.js	2019-09-15 11:33:06.000000000 +0000
@@ -23,7 +23,7 @@
   let expectedResultCount = UrlbarTestUtils.getResultCount(window) - 1;
 
   EventUtils.synthesizeKey("KEY_ArrowDown");
-  Assert.equal(UrlbarTestUtils.getSelectedIndex(window), 1);
+  Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), 1);
   EventUtils.synthesizeKey("KEY_Delete", { shiftKey: true });
   await promiseVisitRemoved;
   await TestUtils.waitForCondition(
@@ -61,7 +61,7 @@
   Assert.equal(result.url, TEST_URL, "Found the expected result");
 
   EventUtils.synthesizeKey("KEY_ArrowDown");
-  Assert.equal(UrlbarTestUtils.getSelectedIndex(window), 1);
+  Assert.equal(UrlbarTestUtils.getSelectedRowIndex(window), 1);
   EventUtils.synthesizeKey("KEY_Delete", { shiftKey: true });
 
   // We don't have an easy way of determining if the event was process or not,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbar_speculative_connect.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbar_speculative_connect.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbar_speculative_connect.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbar_speculative_connect.js	2019-09-15 11:33:06.000000000 +0000
@@ -106,7 +106,7 @@
     info("Clicking on the second result");
     EventUtils.synthesizeMouseAtCenter(listitem, { type: "mousedown" }, window);
     Assert.equal(
-      UrlbarTestUtils.getSelectedElement(window),
+      UrlbarTestUtils.getSelectedRow(window),
       listitem,
       "The second item is selected"
     );
@@ -178,7 +178,7 @@
     info(`Searching for the empty string`);
     await promiseAutocompleteResultPopup("", window, true);
     ok(UrlbarTestUtils.getResultCount(window) > 0, "Has results");
-    let result = await UrlbarTestUtils.getSelectedElement(window);
+    let result = await UrlbarTestUtils.getSelectedRow(window);
     Assert.strictEqual(result, null, `Should have no selection`);
     await UrlbarTestUtils.promiseSpeculativeConnections(
       server,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbar_speculative_connect_not_with_client_cert.js firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbar_speculative_connect_not_with_client_cert.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/browser/browser_urlbar_speculative_connect_not_with_client_cert.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/browser/browser_urlbar_speculative_connect_not_with_client_cert.js	2019-09-15 11:33:06.000000000 +0000
@@ -40,7 +40,7 @@
         expectingChooseCertificate ? "" : "not "
       }expecting chooseCertificate to be called`
     );
-    ok(certList.length > 0, "Should have at least one certificate");
+    ok(!!certList.length, "Should have at least one certificate");
     selectedIndex.value = 0;
     rememberClientAuthCertificate.value = false;
     chooseCertificateCalled = true;
@@ -194,7 +194,7 @@
     expectingChooseCertificate = false;
     EventUtils.synthesizeMouseAtCenter(listitem, { type: "mousedown" }, window);
     is(
-      UrlbarTestUtils.getSelectedElement(window),
+      UrlbarTestUtils.getSelectedRow(window),
       listitem,
       "The second item is selected"
     );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/UrlbarTestUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/UrlbarTestUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/tests/UrlbarTestUtils.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/tests/UrlbarTestUtils.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -141,8 +141,8 @@
     let typeIconStyle = win.getComputedStyle(typeIcon);
     details.displayed = {
       title: element.getElementsByClassName("urlbarView-title")[0].textContent,
-      action: actions.length > 0 ? actions[0].textContent : null,
-      url: urls.length > 0 ? urls[0].textContent : null,
+      action: actions.length ? actions[0].textContent : null,
+      url: urls.length ? urls[0].textContent : null,
       typeIcon: typeIconStyle["background-image"],
     };
     details.element = {
@@ -169,29 +169,39 @@
 
   /**
    * Gets the currently selected element.
-   * @param {object} win The window containing the urlbar
-   * @returns {HtmlElement|XulElement} the selected element.
+   * @param {object} win The window containing the urlbar.
+   * @returns {HtmlElement|XulElement} The selected element.
    */
   getSelectedElement(win) {
-    return win.gURLBar.view._selected || null;
+    return win.gURLBar.view._selectedElement || null;
+  },
+
+  /**
+   * Gets the currently selected row. If the selected element is a descendant of
+   * a row, this will return the ancestor row.
+   * @param {object} win The window containing the urlbar.
+   * @returns {HTMLElement|XulElement} The selected row.
+   */
+  getSelectedRow(win) {
+    return win.gURLBar.view._getSelectedRow() || null;
   },
 
   /**
-   * Gets the index of the currently selected item.
+   * Gets the index of the currently selected element.
    * @param {object} win The window containing the urlbar.
    * @returns {number} The selected index.
    */
-  getSelectedIndex(win) {
-    return win.gURLBar.view.selectedIndex;
+  getSelectedRowIndex(win) {
+    return win.gURLBar.view.selectedRowIndex;
   },
 
   /**
-   * Selects the item at the index specified.
+   * Selects the element at the index specified.
    * @param {object} win The window containing the urlbar.
    * @param {index} index The index to select.
    */
-  setSelectedIndex(win, index) {
-    win.gURLBar.view.selectedIndex = index;
+  setSelectedRowIndex(win, index) {
+    win.gURLBar.view.selectedRowIndex = index;
   },
 
   /**
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/UrlbarController.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/UrlbarController.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/UrlbarController.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/UrlbarController.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -286,7 +286,7 @@
       let { queryContext } = this._lastQueryContextWrapper;
       let handled = this.view.oneOffSearchButtons.handleKeyPress(
         event,
-        this.view.visibleItemCount,
+        this.view.visibleRowCount,
         this.view.allowEmptySelection,
         queryContext.searchString
       );
@@ -392,7 +392,7 @@
    */
   speculativeConnect(result, context, reason) {
     // Never speculative connect in private contexts.
-    if (!this.input || context.isPrivate || context.results.length == 0) {
+    if (!this.input || context.isPrivate || !context.results.length) {
       return;
     }
     let { url } = UrlbarUtils.getUrlFromResult(result);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/UrlbarEventBufferer.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/UrlbarEventBufferer.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/UrlbarEventBufferer.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/UrlbarEventBufferer.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -231,7 +231,7 @@
     // If any event has been deferred for this search, then defer all subsequent
     // events so that the user does not experience them out of order.
     // All events will be replayed when _deferringTimeout fires.
-    if (this._eventsQueue.length > 0) {
+    if (this._eventsQueue.length) {
       return true;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/UrlbarInput.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/UrlbarInput.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/UrlbarInput.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/UrlbarInput.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -449,7 +449,7 @@
 
     this.controller.engagementEvent.record(event, {
       numChars,
-      selIndex: this.view.selectedIndex,
+      selIndex: this.view.selectedRowIndex,
       selType,
     });
 
@@ -496,7 +496,7 @@
       allowInheritPrincipal: false,
     };
 
-    let selIndex = this.view.selectedIndex;
+    let selIndex = this.view.selectedRowIndex;
     if (!result.payload.keywordOffer) {
       this.view.close();
     }
@@ -1963,7 +1963,7 @@
   }
   // The URL bar automatically handles inputs with newline characters,
   // so we can get away with treating text/x-moz-url flavours as text/plain.
-  if (links.length > 0 && links[0].url) {
+  if (links.length && links[0].url) {
     event.preventDefault();
     let href = links[0].url;
     if (UrlbarUtils.stripUnsafeProtocolOnPaste(href) != href) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/UrlbarTokenizer.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/UrlbarTokenizer.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/UrlbarTokenizer.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/UrlbarTokenizer.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -158,7 +158,7 @@
    * @returns {boolean} whether the token looks like an origin.
    */
   looksLikeOrigin(token) {
-    if (token.length == 0) {
+    if (!token.length) {
       return false;
     }
     let atIndex = token.indexOf("@");
@@ -312,7 +312,7 @@
   }
 
   // Handle restriction characters.
-  if (restrictions.length > 0) {
+  if (restrictions.length) {
     // We can apply two kind of restrictions: type (bookmark, search, ...) and
     // matching (url, title). These kind of restrictions can be combined, but we
     // can only have one restriction per kind.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/UrlbarView.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/UrlbarView.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/components/urlbar/UrlbarView.jsm	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/components/urlbar/UrlbarView.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -84,7 +84,7 @@
 
     // Disable one off search buttons from appearing if
     // the contextual tip is the only item in the urlbar view.
-    if (this.visibleItemCount == 0) {
+    if (this.visibleRowCount == 0) {
       this._enableOrDisableOneOffSearches(false);
     }
 
@@ -101,7 +101,7 @@
       // When the pending query has finished and there's 0 results then
       // close the urlbar view.
       this.input.lastQueryContextPromise.then(() => {
-        if (this.visibleItemCount == 0) {
+        if (this.visibleRowCount == 0) {
           this.close();
         }
       });
@@ -148,14 +148,21 @@
     );
   }
 
-  get selectedIndex() {
-    if (!this.isOpen || !this._selected) {
+  get selectedRowIndex() {
+    if (!this.isOpen) {
+      return -1;
+    }
+
+    let selectedRow = this._getSelectedRow();
+
+    if (!selectedRow) {
       return -1;
     }
-    return this._selected.result.uiIndex;
+
+    return selectedRow.result.uiIndex;
   }
 
-  set selectedIndex(val) {
+  set selectedRowIndex(val) {
     if (!this.isOpen) {
       throw new Error(
         "UrlbarView: Cannot select an item if the view isn't open."
@@ -163,17 +170,17 @@
     }
 
     if (val < 0) {
-      this._selectItem(null);
+      this._selectElement(null);
       return val;
     }
 
     let items = Array.from(this._rows.children).filter(r =>
-      this._isRowVisible(r)
+      this._isElementVisible(r)
     );
     if (val >= items.length) {
       throw new Error(`UrlbarView: Index ${val} is out of bounds.`);
     }
-    this._selectItem(items[val]);
+    this._selectElement(items[val]);
     return val;
   }
 
@@ -182,10 +189,17 @@
    *   The currently selected result.
    */
   get selectedResult() {
-    if (!this.isOpen || !this._selected) {
+    if (!this.isOpen) {
+      return null;
+    }
+
+    let selectedRow = this._getSelectedRow();
+
+    if (!selectedRow) {
       return null;
     }
-    return this._selected.result;
+
+    return selectedRow.result;
   }
 
   /**
@@ -194,10 +208,10 @@
    *   than the number of results in the current query context since the view
    *   may be showing stale results.
    */
-  get visibleItemCount() {
+  get visibleRowCount() {
     let sum = 0;
     for (let row of this._rows.children) {
-      sum += Number(this._isRowVisible(row));
+      sum += Number(this._isElementVisible(row));
     }
     return sum;
   }
@@ -221,45 +235,49 @@
     // Freeze results as the user is interacting with them.
     this.controller.cancelQuery();
 
-    let row = this._selected;
+    let selectedElement = this._selectedElement;
 
-    // Results over maxResults may be hidden and should not be selectable.
-    let lastElementChild = this._rows.lastElementChild;
-    while (lastElementChild && !this._isRowVisible(lastElementChild)) {
-      lastElementChild = lastElementChild.previousElementSibling;
-    }
-
-    if (!row) {
-      this._selectItem(
-        reverse ? lastElementChild : this._rows.firstElementChild
+    // We cache the first and last rows since they will not change while
+    // selectBy is running.
+    let firstSelectableElement = this._getFirstSelectableElement();
+    // _getLastSelectableElement will not return an element that is over
+    // maxResults and thus may be hidden and not selectable.
+    let lastSelectableElement = this._getLastSelectableElement();
+
+    if (!selectedElement) {
+      this._selectElement(
+        reverse ? lastSelectableElement : firstSelectableElement
       );
       return;
     }
-
     let endReached = reverse
-      ? row == this._rows.firstElementChild
-      : row == lastElementChild;
+      ? selectedElement == firstSelectableElement
+      : selectedElement == lastSelectableElement;
     if (endReached) {
       if (this.allowEmptySelection) {
-        row = null;
+        selectedElement = null;
       } else {
-        row = reverse ? lastElementChild : this._rows.firstElementChild;
+        selectedElement = reverse
+          ? lastSelectableElement
+          : firstSelectableElement;
       }
-      this._selectItem(row);
+      this._selectElement(selectedElement);
       return;
     }
 
     while (amount-- > 0) {
-      let next = reverse ? row.previousElementSibling : row.nextElementSibling;
+      let next = reverse
+        ? this._getPreviousSelectableElement(selectedElement)
+        : this._getNextSelectableElement(selectedElement);
       if (!next) {
         break;
       }
-      if (!this._isRowVisible(next)) {
+      if (!this._isElementVisible(next)) {
         continue;
       }
-      row = next;
+      selectedElement = next;
     }
-    this._selectItem(row);
+    this._selectElement(selectedElement);
   }
 
   removeAccessibleFocus() {
@@ -326,13 +344,13 @@
     if (queryContext.lastResultCount == 0) {
       if (queryContext.preselected) {
         isFirstPreselectedResult = true;
-        this._selectItem(this._rows.firstElementChild, {
+        this._selectElement(this._getFirstSelectableElement(), {
           updateInput: false,
           setAccessibleFocus: this.controller._userSelectionBehavior == "arrow",
         });
       } else {
         // Clear the selection when we get a new set of results.
-        this._selectItem(null, {
+        this._selectElement(null, {
           updateInput: false,
         });
       }
@@ -372,7 +390,7 @@
 
     this._updateIndices();
 
-    if (rowToRemove != this._selected) {
+    if (rowToRemove != this._getSelectedRow()) {
       return;
     }
 
@@ -382,7 +400,7 @@
       newSelectionIndex = this._queryContext.results.length - 1;
     }
     if (newSelectionIndex >= 0) {
-      this.selectedIndex = newSelectionIndex;
+      this.selectedRowIndex = newSelectionIndex;
     }
   }
 
@@ -744,7 +762,7 @@
 
     let tagsContainer = item._elements.get("tagsContainer");
     tagsContainer.textContent = "";
-    if (result.payload.tags && result.payload.tags.length > 0) {
+    if (result.payload.tags && result.payload.tags.length) {
       tagsContainer.append(
         ...result.payload.tags.map((tag, i) => {
           const element = this._createElement("span");
@@ -837,8 +855,24 @@
     }
   }
 
-  _isRowVisible(row) {
-    return row.style.display != "none";
+  /**
+   * Returns true if a row or a descendant in the view is visible.
+   *
+   * @param {Element} element
+   *   A row in the view or a descendant of the row.
+   * @returns {boolean}
+   *   True if `element` or `element`'s ancestor row is visible in the view.
+   */
+  _isElementVisible(element) {
+    if (!element.classList.contains("urlbarView-row")) {
+      element = element.closest(".urlbarView-row");
+    }
+
+    if (!element) {
+      return false;
+    }
+
+    return element.style.display != "none";
   }
 
   _removeStaleRows() {
@@ -869,23 +903,145 @@
     }
   }
 
-  _selectItem(item, { updateInput = true, setAccessibleFocus = true } = {}) {
-    if (this._selected) {
-      this._selected.toggleAttribute("selected", false);
-      this._selected.removeAttribute("aria-selected");
+  _selectElement(item, { updateInput = true, setAccessibleFocus = true } = {}) {
+    if (this._selectedElement) {
+      this._selectedElement.toggleAttribute("selected", false);
+      this._selectedElement.removeAttribute("aria-selected");
     }
     if (item) {
       item.toggleAttribute("selected", true);
       item.setAttribute("aria-selected", "true");
     }
     this._setAccessibleFocus(setAccessibleFocus && item);
-    this._selected = item;
+    this._selectedElement = item;
 
     if (updateInput) {
       this.input.setValueFromResult(item && item.result);
     }
   }
 
+  /**
+   * Returns the first selectable element in the view.
+   *
+   * @returns {Element} The first selectable element in the view.
+   */
+  _getFirstSelectableElement() {
+    let firstElementChild = this._rows.firstElementChild;
+    if (
+      firstElementChild.result &&
+      firstElementChild.result.type == UrlbarUtils.RESULT_TYPE.TIP
+    ) {
+      firstElementChild = firstElementChild.querySelector(
+        ".urlbarView-tip-button"
+      );
+    }
+    return firstElementChild;
+  }
+
+  /**
+   * Returns the last selectable element in the view.
+   *
+   * @returns {Element} The last selectable element in the view.
+   */
+  _getLastSelectableElement() {
+    let lastElementChild = this._rows.lastElementChild;
+
+    // We are only interested in visible elements.
+    while (lastElementChild && !this._isElementVisible(lastElementChild)) {
+      lastElementChild = this._getPreviousSelectableElement(lastElementChild);
+    }
+
+    if (
+      lastElementChild.result &&
+      lastElementChild.result.type == UrlbarUtils.RESULT_TYPE.TIP
+    ) {
+      lastElementChild = lastElementChild.querySelector(".urlbarView-tip-help");
+    }
+
+    return lastElementChild;
+  }
+
+  /**
+   * Returns the next selectable element after the parameter `element`.
+   * @param {Element} element A selectable element in the view.
+   * @returns {Element} The next selectable element after the parameter `element`.
+   */
+  _getNextSelectableElement(element) {
+    let next;
+    if (element.classList.contains("urlbarView-tip-button")) {
+      next = element
+        .closest(".urlbarView-row")
+        .querySelector(".urlbarView-tip-help");
+    } else if (element.classList.contains("urlbarView-tip-help")) {
+      next = element.closest(".urlbarView-row").nextElementSibling;
+    } else {
+      next = element.nextElementSibling;
+    }
+
+    if (!next) {
+      return null;
+    }
+
+    if (next.result && next.result.type == UrlbarUtils.RESULT_TYPE.TIP) {
+      next = next.querySelector(".urlbarView-tip-button");
+    }
+
+    return next;
+  }
+
+  /**
+   * Returns the previous selectable element before the parameter `element`.
+   * @param {Element} element A selectable element in the view.
+   * @returns {Element} The previous selectable element before the parameter `element`.
+   */
+  _getPreviousSelectableElement(element) {
+    let previous;
+    if (element.classList.contains("urlbarView-tip-button")) {
+      previous = element.closest(".urlbarView-row").previousElementSibling;
+    } else if (element.classList.contains("urlbarView-tip-help")) {
+      previous = element
+        .closest(".urlbarView-row")
+        .querySelector(".urlbarView-tip-button");
+    } else {
+      previous = element.previousElementSibling;
+    }
+
+    if (!previous) {
+      return null;
+    }
+
+    if (
+      previous.result &&
+      previous.result.type == UrlbarUtils.RESULT_TYPE.TIP
+    ) {
+      previous = previous.querySelector(".urlbarView-tip-help");
+    }
+
+    return previous;
+  }
+
+  /**
+   * Returns the currently selected row. Useful when this._selectedElement may be a
+   * non-row element, such as a descendant element of RESULT_TYPE.TIP.
+   *
+   * @returns {Element}
+   *   The currently selected row, or ancestor row of the currently selected item.
+   *
+   */
+  _getSelectedRow() {
+    if (!this.isOpen || !this._selectedElement) {
+      return null;
+    }
+    let selected = this._selectedElement;
+
+    if (!selected.classList.contains("urlbarView-row")) {
+      // selected may be an element in a result group, like RESULT_TYPE.TIP.
+      selected = selected.closest(".urlbarView-row");
+    }
+
+    return selected;
+  }
+
   _setAccessibleFocus(item) {
     if (item) {
       this.input.inputField.setAttribute("aria-activedescendant", item.id);
@@ -1033,7 +1189,7 @@
         while (!row.classList.contains("urlbarView-row")) {
           row = row.parentNode;
         }
-        this._selectItem(row, { updateInput: false });
+        this._selectElement(row, { updateInput: false });
         this.controller.speculativeConnect(
           this.selectedResult,
           this._queryContext,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/content/editDialog.js firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/content/editDialog.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/content/editDialog.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/content/editDialog.js	2019-09-15 11:33:06.000000000 +0000
@@ -132,9 +132,7 @@
   updateSaveButtonState() {
     // Toggle disabled attribute on the save button based on
     // whether the form is filled or empty.
-    if (
-      Object.keys(this._elements.fieldContainer.buildFormObject()).length == 0
-    ) {
+    if (!Object.keys(this._elements.fieldContainer.buildFormObject()).length) {
       this._elements.save.setAttribute("disabled", true);
     } else {
       this._elements.save.removeAttribute("disabled");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/FormAutofillHandler.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/FormAutofillHandler.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/FormAutofillHandler.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/FormAutofillHandler.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -517,7 +517,7 @@
    */
   createRecord() {
     let details = this.fieldDetails;
-    if (!this.isEnabled() || !details || details.length == 0) {
+    if (!this.isEnabled() || !details || !details.length) {
       return null;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/FormAutofillHeuristics.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/FormAutofillHeuristics.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/FormAutofillHeuristics.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/FormAutofillHeuristics.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -167,7 +167,7 @@
     if (!this._sectionEnabled) {
       return this._getFinalDetails(this.fieldDetails);
     }
-    if (this._sections.length == 0) {
+    if (!this._sections.length) {
       return [];
     }
     if (
@@ -304,7 +304,7 @@
         });
         return section;
       })
-      .filter(section => section.fieldDetails.length > 0);
+      .filter(section => !!section.fieldDetails.length);
   }
 
   elementExisting(index) {
@@ -352,7 +352,7 @@
         return;
       }
 
-      if (el.nodeType == el.TEXT_NODE || el.childNodes.length == 0) {
+      if (el.nodeType == el.TEXT_NODE || !el.childNodes.length) {
         let trimmedText = el.textContent.trim();
         if (trimmedText) {
           strings.push(trimmedText);
@@ -1000,7 +1000,7 @@
     }
 
     let regexps = this._getRegExpList(isAutoCompleteOff, element.tagName);
-    if (regexps.length == 0) {
+    if (!regexps.length) {
       return null;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/ProfileAutoCompleteResult.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/ProfileAutoCompleteResult.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/ProfileAutoCompleteResult.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/ProfileAutoCompleteResult.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -78,7 +78,7 @@
     // The result code of this result object.
     if (resultCode) {
       this.searchResult = resultCode;
-    } else if (matchingProfiles.length > 0) {
+    } else if (matchingProfiles.length) {
       this.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
     } else {
       this.searchResult = Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/test/browser/head.js firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/test/browser/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/test/browser/head.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/test/browser/head.js	2019-09-15 11:33:06.000000000 +0000
@@ -243,7 +243,7 @@
   await BrowserTestUtils.waitForCondition(() => {
     const listItemElems = getDisplayedPopupItems(browser);
     return (
-      [...listItemElems].length > 0 &&
+      !![...listItemElems].length &&
       [...listItemElems].every(item => {
         return (
           (item.getAttribute("originaltype") == "autofill-profile" ||
@@ -329,7 +329,7 @@
 
 function getNotification(index = 0) {
   let notifications = PopupNotifications.panel.childNodes;
-  ok(notifications.length > 0, "at least one notification displayed");
+  ok(!!notifications.length, "at least one notification displayed");
   ok(true, notifications.length + " notification(s)");
   return notifications[index];
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/test/mochitest/formautofill_parent_utils.js	2019-09-15 11:33:06.000000000 +0000
@@ -142,7 +142,7 @@
       record => record.guid
     );
 
-    if (guids.length == 0) {
+    if (!guids.length) {
       return;
     }
 
@@ -161,7 +161,7 @@
       record => record.guid
     );
 
-    if (guids.length == 0) {
+    if (!guids.length) {
       return;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/test/unit/test_profileAutocompleteResult.js firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/test/unit/test_profileAutocompleteResult.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/formautofill/test/unit/test_profileAutocompleteResult.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/formautofill/test/unit/test_profileAutocompleteResult.js	2019-09-15 11:33:06.000000000 +0000
@@ -422,7 +422,7 @@
         equal(actual.getImageAt(index), item.image);
       });
 
-      if (expectedValue.items.length != 0) {
+      if (expectedValue.items.length) {
         Assert.throws(
           () => actual.getValueAt(expectedItemLength),
           /Index out of range\./
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/pdfjs/test/browser_pdfjs_main.js firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/pdfjs/test/browser_pdfjs_main.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/extensions/pdfjs/test/browser_pdfjs_main.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/extensions/pdfjs/test/browser_pdfjs_main.js	2019-09-15 11:33:06.000000000 +0000
@@ -62,7 +62,7 @@
         var viewBookmark = content.document.querySelector("a#viewBookmark");
         viewBookmark.click();
 
-        Assert.ok(viewBookmark.href.length > 0, "viewBookmark button has href");
+        Assert.ok(!!viewBookmark.href.length, "viewBookmark button has href");
 
         var viewer = content.wrappedJSObject.PDFViewerApplication;
         await viewer.close();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/installer/windows/nsis/installer.nsi firefox-trunk-71.0~a1~hg20190915r493291/browser/installer/windows/nsis/installer.nsi
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/installer/windows/nsis/installer.nsi	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/installer/windows/nsis/installer.nsi	2019-09-15 11:33:07.000000000 +0000
@@ -949,7 +949,7 @@
   ${GetParameters} $0
   ${GetOptions} "$0" "/UAC:" $1
   ${If} ${Errors}
-    ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\""
+    ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\" -first-startup"
   ${Else}
     GetFunctionAddress $0 LaunchAppFromElevatedProcess
     UAC::ExecCodeSegment $0
@@ -962,7 +962,7 @@
   ; Set our current working directory to the application's install directory
   ; otherwise the 7-Zip temp directory will be in use and won't be deleted.
   SetOutPath "$INSTDIR"
-  ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\""
+  ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\" -first-startup"
 FunctionEnd
 
 Function SendPing
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/installer/windows/nsis/stub.nsi firefox-trunk-71.0~a1~hg20190915r493291/browser/installer/windows/nsis/stub.nsi
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/installer/windows/nsis/stub.nsi	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/installer/windows/nsis/stub.nsi	2019-09-15 11:33:06.000000000 +0000
@@ -1789,9 +1789,9 @@
   ${GetOptions} "$0" "/UAC:" $1
   ${If} ${Errors}
     ${If} $CheckboxCleanupProfile == 1
-      ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\" -reset-profile -migration"
+      ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\" -reset-profile -migration -first-startup"
     ${Else}
-      ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\""
+      ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\" -first-startup"
     ${EndIf}
   ${Else}
     StrCpy $R1 $CheckboxCleanupProfile
@@ -1807,9 +1807,9 @@
   ; Set the current working directory to the installation directory
   SetOutPath "$INSTDIR"
   ${If} $R1 == 1
-    ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\" -reset-profile -migration"
+    ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\" -reset-profile -migration -first-startup"
   ${Else}
-    ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\""
+    ${ExecAndWaitForInputIdle} "$\"$INSTDIR\${FileMainEXE}$\" -first-startup"
   ${EndIf}
 FunctionEnd
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/locales/en-US/browser/aboutLogins.ftl firefox-trunk-71.0~a1~hg20190915r493291/browser/locales/en-US/browser/aboutLogins.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/locales/en-US/browser/aboutLogins.ftl	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/locales/en-US/browser/aboutLogins.ftl	2019-09-15 11:33:06.000000000 +0000
@@ -65,6 +65,9 @@
 login-list-item-title-new-login = New Login
 login-list-item-subtitle-new-login = Enter your login credentials
 login-list-item-subtitle-missing-username = (no username)
+about-logins-list-item-warning-icon = 
+  .alt = Warning icon
+  .title = Breached website
 
 ## Introduction screen
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/locales/en-US/browser/browser.ftl firefox-trunk-71.0~a1~hg20190915r493291/browser/locales/en-US/browser/browser.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/locales/en-US/browser/browser.ftl	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/locales/en-US/browser/browser.ftl	2019-09-15 11:33:07.000000000 +0000
@@ -2,5 +2,48 @@
 # 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/.
 
-browser-urlbar-identity-button =
+urlbar-identity-button =
     .aria-label = View site information
+
+## Tooltips for images appearing in the address bar
+
+urlbar-services-notification-anchor =
+    .tooltiptext = Open install message panel
+urlbar-web-notification-anchor =
+    .tooltiptext = Change whether you can receive notifications from the site
+urlbar-midi-notification-anchor =
+    .tooltiptext = Open MIDI panel
+urlbar-eme-notification-anchor =
+    .tooltiptext = Manage use of DRM software
+urlbar-web-authn-anchor =
+    .tooltiptext = Open Web Authentication panel
+urlbar-canvas-notification-anchor =
+    .tooltiptext = Manage canvas extraction permission
+urlbar-web-rtc-share-microphone-notification-anchor =
+    .tooltiptext = Manage sharing your microphone with the site
+urlbar-default-notification-anchor =
+    .tooltiptext = Open message panel
+urlbar-geolocation-notification-anchor =
+    .tooltiptext = Open location request panel
+urlbar-storage-access-anchor =
+    .tooltiptext = Open browsing activity permission panel
+urlbar-translate-notification-anchor =
+    .tooltiptext = Translate this page
+urlbar-web-rtc-share-screen-notification-anchor =
+    .tooltiptext = Manage sharing your windows or screen with the site
+urlbar-indexed-db-notification-anchor =
+    .tooltiptext = Open offline storage message panel
+urlbar-password-notification-anchor =
+    .tooltiptext = Open save password message panel
+urlbar-translated-notification-anchor =
+    .tooltiptext = Manage page translation
+urlbar-plugins-notification-anchor =
+    .tooltiptext = Manage plug-in use
+urlbar-web-rtc-share-devices-notification-anchor =
+    .tooltiptext = Manage sharing your camera and/or microphone with the site
+urlbar-autoplay-notification-anchor =
+    .tooltiptext = Open autoplay panel
+urlbar-persistent-storage-notification-anchor =
+    .tooltiptext = Store data in Persistent Storage
+urlbar-addons-notification-anchor =
+    .tooltiptext = Open add-on installation message panel
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/locales/en-US/browser/menubar.ftl firefox-trunk-71.0~a1~hg20190915r493291/browser/locales/en-US/browser/menubar.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/locales/en-US/browser/menubar.ftl	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/locales/en-US/browser/menubar.ftl	2019-09-15 11:33:06.000000000 +0000
@@ -213,6 +213,7 @@
     .accesskey = y
 menu-tools-turn-on-sync =
     .label = Turn on { -sync-brand-short-name }…
+    .accesskey = n
 menu-tools-sync-now =
     .label = Sync Now
     .accesskey = S
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/locales/en-US/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/browser/locales/en-US/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/locales/en-US/chrome/browser/browser.dtd	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/locales/en-US/chrome/browser/browser.dtd	2019-09-15 11:33:06.000000000 +0000
@@ -171,29 +171,7 @@
 <!ENTITY printButton.label            "Print">
 <!ENTITY printButton.tooltip          "Print this page">
 
-<!ENTITY urlbar.defaultNotificationAnchor.tooltip         "Open message panel">
-<!ENTITY urlbar.geolocationNotificationAnchor.tooltip     "Open location request panel">
-<!ENTITY urlbar.autoplayNotificationAnchor.tooltip        "Open autoplay panel">
-<!ENTITY urlbar.addonsNotificationAnchor.tooltip          "Open add-on installation message panel">
-<!ENTITY urlbar.canvasNotificationAnchor.tooltip          "Manage canvas extraction permission">
-<!ENTITY urlbar.indexedDBNotificationAnchor.tooltip       "Open offline storage message panel">
-<!ENTITY urlbar.passwordNotificationAnchor.tooltip        "Open save password message panel">
-<!ENTITY urlbar.pluginsNotificationAnchor.tooltip         "Manage plug-in use">
-<!ENTITY urlbar.webNotificationAnchor.tooltip             "Change whether you can receive notifications from the site">
-<!ENTITY urlbar.persistentStorageNotificationAnchor.tooltip     "Store data in Persistent Storage">
 <!ENTITY urlbar.remoteControlNotificationAnchor.tooltip   "Browser is under remote control">
-<!ENTITY urlbar.webAuthnAnchor.tooltip                    "Open Web Authentication panel">
-<!ENTITY urlbar.storageAccessAnchor.tooltip               "Open browsing activity permission panel">
-
-<!ENTITY urlbar.webRTCShareDevicesNotificationAnchor.tooltip      "Manage sharing your camera and/or microphone with the site">
-<!ENTITY urlbar.webRTCShareMicrophoneNotificationAnchor.tooltip   "Manage sharing your microphone with the site">
-<!ENTITY urlbar.webRTCShareScreenNotificationAnchor.tooltip       "Manage sharing your windows or screen with the site">
-
-<!ENTITY urlbar.servicesNotificationAnchor.tooltip        "Open install message panel">
-<!ENTITY urlbar.translateNotificationAnchor.tooltip       "Translate this page">
-<!ENTITY urlbar.translatedNotificationAnchor.tooltip      "Manage page translation">
-<!ENTITY urlbar.emeNotificationAnchor.tooltip             "Manage use of DRM software">
-<!ENTITY urlbar.midiNotificationAnchor.tooltip            "Open MIDI panel">
 
 <!ENTITY urlbar.permissionsGranted.tooltip       "You have granted this website additional permissions.">
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/AsyncTabSwitcher.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/AsyncTabSwitcher.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/AsyncTabSwitcher.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/AsyncTabSwitcher.jsm	2019-09-15 11:33:07.000000000 +0000
@@ -1308,7 +1308,7 @@
 
   addLogFlag(flag, ...subFlags) {
     if (this.logging()) {
-      if (subFlags.length > 0) {
+      if (subFlags.length) {
         flag += `(${subFlags.map(f => (f ? 1 : 0)).join("")})`;
       }
       this._logFlags.push(flag);
@@ -1420,13 +1420,13 @@
       lastMatch = i;
     }
 
-    if (unloadedTabsStrings.length > 0) {
+    if (unloadedTabsStrings.length) {
       accum += `${unloadedTabsStrings.join(",")}:(unloaded) `;
     }
 
     accum += "cached: " + this.tabLayerCache.length + " ";
 
-    if (this._logFlags.length > 0) {
+    if (this._logFlags.length) {
       accum += `[${this._logFlags.join(",")}] `;
       this._logFlags = [];
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/ExtensionsUI.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/ExtensionsUI.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/ExtensionsUI.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/ExtensionsUI.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -240,7 +240,7 @@
       let strings = this._buildStrings(info);
 
       // If this is an update with no promptable permissions, just apply it
-      if (info.type == "update" && strings.msgs.length == 0) {
+      if (info.type == "update" && !strings.msgs.length) {
         info.resolve();
         return;
       }
@@ -288,7 +288,7 @@
       let strings = this._buildStrings(info);
 
       // If we don't prompt for any new permissions, just apply it
-      if (strings.msgs.length == 0) {
+      if (!strings.msgs.length) {
         info.resolve();
         return;
       }
@@ -326,7 +326,7 @@
       });
 
       // If we don't have any promptable permissions, just proceed
-      if (strings.msgs.length == 0) {
+      if (!strings.msgs.length) {
         resolve(true);
         return;
       }
@@ -399,14 +399,14 @@
 
           let listIntroEl = doc.getElementById("addon-webext-perm-intro");
           listIntroEl.textContent = strings.listIntro;
-          listIntroEl.hidden = strings.msgs.length == 0;
+          listIntroEl.hidden = !strings.msgs.length;
 
           let listInfoEl = doc.getElementById("addon-webext-perm-info");
           listInfoEl.textContent = strings.learnMore;
           listInfoEl.href =
             Services.urlFormatter.formatURLPref("app.support.baseURL") +
             "extension-permissions";
-          listInfoEl.hidden = strings.msgs.length == 0;
+          listInfoEl.hidden = !strings.msgs.length;
 
           let list = doc.getElementById("addon-webext-perm-list");
           while (list.firstChild) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/FaviconLoader.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/FaviconLoader.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/FaviconLoader.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/FaviconLoader.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -426,7 +426,7 @@
  * @param {integer} preferredWidth The preferred width for tab icons.
  */
 function selectIcons(iconInfos, preferredWidth) {
-  if (iconInfos.length == 0) {
+  if (!iconInfos.length) {
     return {
       richIcon: null,
       tabIcon: null,
@@ -598,7 +598,7 @@
     // we can still attempt to load icons, which will fail since the content
     // window is no longer available. Checking if iconInfos has been cleared
     // allows us to bail out early in this case.
-    if (this.iconInfos.length == 0) {
+    if (!this.iconInfos.length) {
       return;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/PermissionUI.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/PermissionUI.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/PermissionUI.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/PermissionUI.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -1062,7 +1062,7 @@
   let types = request.types.QueryInterface(Ci.nsIArray);
   let perm = types.queryElementAt(0, Ci.nsIContentPermissionType);
   this.isSysexPerm =
-    perm.options.length > 0 &&
+    !!perm.options.length &&
     perm.options.queryElementAt(0, Ci.nsISupportsString) == "sysex";
   this.permName = "midi";
   if (this.isSysexPerm) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/Sanitizer.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/Sanitizer.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/Sanitizer.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/Sanitizer.jsm	2019-09-15 11:33:06.000000000 +0000
@@ -552,7 +552,7 @@
           }
         }
 
-        if (windowList.length == 0) {
+        if (!windowList.length) {
           return;
         }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/test/browser/browser_PageActions.js firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/test/browser/browser_PageActions.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/test/browser/browser_PageActions.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/test/browser/browser_PageActions.js	2019-09-15 11:33:07.000000000 +0000
@@ -1396,7 +1396,7 @@
   // Get the list of actions initially in the urlbar.
   let initialActionsInUrlbar = PageActions.actionsInUrlbar(window);
   Assert.ok(
-    initialActionsInUrlbar.length > 0,
+    !!initialActionsInUrlbar.length,
     "This test expects there to be at least one action in the urlbar initially (like the bookmark star)"
   );
 
@@ -1754,7 +1754,7 @@
     true
   );
   ok(
-    snapshot.parent && snapshot.parent.length > 0,
+    snapshot.parent && !!snapshot.parent.length,
     "Got parent telemetry events in the snapshot"
   );
   let relatedEvents = snapshot.parent
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/test/browser/browser_UsageTelemetry_urlbar.js	2019-09-15 11:33:06.000000000 +0000
@@ -740,7 +740,7 @@
     let p = BrowserTestUtils.browserLoaded(tab.linkedBrowser);
     await searchInAwesomebar("query");
     info("Select the second result and press Return.");
-    UrlbarTestUtils.setSelectedIndex(window, 1);
+    UrlbarTestUtils.setSelectedRowIndex(window, 1);
     EventUtils.synthesizeKey("KEY_Enter");
     await p;
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/webrtcUI.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/webrtcUI.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/webrtcUI.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/webrtcUI.jsm	2019-09-15 11:33:07.000000000 +0000
@@ -699,8 +699,8 @@
             browser._devicePermissionPrincipals || [];
           browser._devicePermissionPrincipals.push(principal);
 
-          let camNeeded = videoDevices.length > 0;
-          let micNeeded = audioDevices.length > 0;
+          let camNeeded = !!videoDevices.length;
+          let micNeeded = !!audioDevices.length;
           checkOSPermission(camNeeded, micNeeded).then(havePermission => {
             if (havePermission) {
               let mm = browser.messageManager;
@@ -1067,8 +1067,8 @@
           aBrowser._devicePermissionPrincipals.push(principal);
         }
 
-        let camNeeded = videoDevices.length > 0;
-        let micNeeded = audioDevices.length > 0;
+        let camNeeded = !!videoDevices.length;
+        let micNeeded = !!audioDevices.length;
         let havePermission = await checkOSPermission(camNeeded, micNeeded);
         if (!havePermission) {
           denyRequestNoPermission(notification.browser, aRequest);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/WindowsJumpLists.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/WindowsJumpLists.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/WindowsJumpLists.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/WindowsJumpLists.jsm	2019-09-15 11:33:07.000000000 +0000
@@ -218,7 +218,7 @@
 
   _pendingStatements: {},
   _hasPendingStatements: function WTBJL__hasPendingStatements() {
-    return Object.keys(this._pendingStatements).length > 0;
+    return !!Object.keys(this._pendingStatements).length;
   },
 
   async _buildList() {
@@ -265,7 +265,7 @@
   async _startBuild() {
     this._builder.abortListBuild();
     let URIsToRemove = await this._builder.initListBuild();
-    if (URIsToRemove.length > 0) {
+    if (URIsToRemove.length) {
       // Prior to building, delete removed items from history.
       this._clearHistory(URIsToRemove);
     }
@@ -302,7 +302,7 @@
       items.appendElement(item);
     }, this);
 
-    if (items.length > 0) {
+    if (items.length) {
       this._builder.addListToBuild(
         this._builder.JUMPLIST_CATEGORY_TASKS,
         items
@@ -311,7 +311,7 @@
   },
 
   _buildCustom: function WTBJL__buildCustom(title, items) {
-    if (items.length > 0) {
+    if (items.length) {
       this._builder.addListToBuild(
         this._builder.JUMPLIST_CATEGORY_CUSTOMLIST,
         items,
@@ -427,7 +427,7 @@
     ].createInstance(Ci.nsILocalHandlerApp);
     handlerApp.executable = file;
     // handlers default to the leaf name if a name is not specified
-    if (name && name.length != 0) {
+    if (name && name.length) {
       handlerApp.name = name;
     }
     handlerApp.detailedDescription = description;
@@ -499,7 +499,7 @@
       })
       .filter(uri => !!uri);
 
-    if (URIsToRemove.length > 0) {
+    if (URIsToRemove.length) {
       PlacesUtils.history.remove(URIsToRemove).catch(Cu.reportError);
     }
   },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/WindowsPreviewPerTab.jsm firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/WindowsPreviewPerTab.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/modules/WindowsPreviewPerTab.jsm	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/modules/WindowsPreviewPerTab.jsm	2019-09-15 11:33:07.000000000 +0000
@@ -839,7 +839,7 @@
     win.gTaskbarTabGroup.destroy();
     delete win.gTaskbarTabGroup;
 
-    if (this.windows.length == 0) {
+    if (!this.windows.length) {
       this.destroy();
     }
   },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/themes/shared/searchbar.inc.css firefox-trunk-71.0~a1~hg20190915r493291/browser/themes/shared/searchbar.inc.css
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/themes/shared/searchbar.inc.css	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/themes/shared/searchbar.inc.css	2019-09-15 11:33:07.000000000 +0000
@@ -57,8 +57,8 @@
 }
 
 .search-panel-header > label {
-  margin-top: 2px !important;
-  margin-bottom: 1px !important;
+  margin-top: 2px;
+  margin-bottom: 1px;
 }
 
 .search-panel-input-value {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/browser/themes/shared/urlbar-autocomplete.inc.css firefox-trunk-71.0~a1~hg20190915r493291/browser/themes/shared/urlbar-autocomplete.inc.css
--- firefox-trunk-71.0~a1~hg20190913r492975/browser/themes/shared/urlbar-autocomplete.inc.css	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/browser/themes/shared/urlbar-autocomplete.inc.css	2019-09-15 11:33:06.000000000 +0000
@@ -62,7 +62,7 @@
 
 .urlbarView:not(.megabar) {
   position: fixed;
-  z-index: 1;
+  z-index: 3;
   left: 0;
   right: 0;
   background: var(--autocomplete-popup-background);
@@ -204,6 +204,7 @@
   -moz-context-properties: fill, fill-opacity;
 }
 
+.urlbarView-tip-help[selected],
 .urlbarView-tip-help:hover {
   background-color: var(--in-content-button-background-hover);
 }
@@ -212,11 +213,6 @@
   background-color: var(--in-content-button-background-active);
 }
 
-.urlbarView-tip-help:-moz-focusring,
-.urlbarView-tip-button:-moz-focusring {
-  box-shadow: 0 0 0 1px #0a84ff inset, 0 0 0 1px #0a84ff, 0 0 0 4px rgba(10, 132, 255, 0.3);
-}
-
 #urlbar-contextual-tip-icon {
   min-width: 24px;
   height: 24px;
@@ -275,6 +271,11 @@
   flex-shrink: 0;
 }
 
+.urlbarView-tip-button[selected] {
+  color: white;
+  background-color: var(--in-content-primary-button-background);
+  box-shadow: 0 0 0 1px #0a84ff inset, 0 0 0 1px #0a84ff, 0 0 0 4px rgba(10, 132, 255, 0.3);
+}
 .urlbarView-tip-button:hover {
   color: white;
   background-color: var(--in-content-primary-button-background-hover);
@@ -285,11 +286,6 @@
   background-color: var(--in-content-primary-button-background-active);
 }
 
-.urlbarView-tip-button:-moz-focusring {
- color: white:
- background-color: var(--in-content-primary-button-background);
-}
-
 .urlbarView-tip-button-spacer {
   flex: 1;
   min-width: 75px;
@@ -379,7 +375,8 @@
 
 /* Search one-offs. */
 #urlbar .search-one-offs {
-  -moz-box-orient: horizontal;
+  display: flex;
+  align-items: start;
   padding-block: 16px;
 }
 
@@ -398,17 +395,26 @@
 
 #urlbar .search-panel-header {
   padding: 0;
+  min-height: 32px;
   display: flex;
   flex-direction: column;
   justify-content: center;
 }
 
+#urlbar .search-panel-one-offs-header-label {
+  margin: 0;
+}
+
 #urlbar .searchbar-engine-one-off-item {
   min-width: 32px;
   height: 32px;
   margin: 0 4px;
 }
 
+#urlbar .search-one-offs-spacer {
+  flex-grow: 1;
+}
+
 /* search bar popup */
 
 #PopupSearchAutoComplete {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/build/build-infer/build-infer.py firefox-trunk-71.0~a1~hg20190915r493291/build/build-infer/build-infer.py
--- firefox-trunk-71.0~a1~hg20190913r492975/build/build-infer/build-infer.py	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/build/build-infer/build-infer.py	2019-09-15 11:33:07.000000000 +0000
@@ -107,11 +107,26 @@
         run_in(source_dir, ['git']+command)
     for p in config.get('patches', []):
         run_in(source_dir, ['git', 'apply', os.path.join(dir_path, p)])
+    # configure opam
+    run_in(source_dir, ['opam', 'init', '--no-setup', '--disable-sandboxing'])
     # build infer
     run_in(source_dir, ['./build-infer.sh', 'java'],
            extra_env={'NO_CMAKE_STRIP': '1'})
+
     package_name = 'infer'
+    infer_package = os.path.join(os.getcwd(), package_name)
+    # We need to create a package with all of the depended libraries injected in it
+    run_in(source_dir, ['make', 'install-with-libs', 'BUILD_MODE=opt',
+                        'PATCHELF=patchelf', 'DESTDIR={}'.format(infer_package),
+                        'libdir_relative_to_bindir=../lib'])
+
+
+    infer_package_with_pref = os.path.join(infer_package, 'usr')
     if not args.skip_tar:
+        os.rename(os.path.join(infer_package_with_pref, 'local'),
+                  os.path.join(infer_package_with_pref, 'infer'))
         build_tar_package('tar', '%s.tar.xz' % (package_name),
-                          source_dir, [os.path.join('infer', 'bin'),
-                                       os.path.join('infer', 'lib')])
+                          infer_package_with_pref,
+                          [os.path.join('infer', 'bin'),
+                           os.path.join('infer', 'lib'),
+                           os.path.join('infer', 'share')])
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/build/build-infer/infer-linux64.json firefox-trunk-71.0~a1~hg20190915r493291/build/build-infer/infer-linux64.json
--- firefox-trunk-71.0~a1~hg20190913r492975/build/build-infer/infer-linux64.json	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/build/build-infer/infer-linux64.json	2019-09-15 11:33:07.000000000 +0000
@@ -1,5 +1,5 @@
 {
     "infer_repo": "https://github.com/facebook/infer",
-    "infer_revision": "14aa1edbf532675f48ba0a35a2e55d07b79b1f3c",
+    "infer_revision": "99464c01da5809e7159ed1a75ef10f60d34506a4",
     "patches": []
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/.clang-format-ignore firefox-trunk-71.0~a1~hg20190915r493291/.clang-format-ignore
--- firefox-trunk-71.0~a1~hg20190913r492975/.clang-format-ignore	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/.clang-format-ignore	2019-09-15 11:33:06.000000000 +0000
@@ -114,7 +114,6 @@
 js/src/vtune/jitprofiling.h
 js/src/vtune/legacy/.*
 media/ffvpx/.*
-media/gmp-clearkey/0.1/openaes/.*
 media/kiss_fft/.*
 media/libaom/.*
 media/libcubeb/.*
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/debian/changelog firefox-trunk-71.0~a1~hg20190915r493291/debian/changelog
--- firefox-trunk-71.0~a1~hg20190913r492975/debian/changelog	2019-09-13 05:29:52.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/debian/changelog	2019-09-15 11:55:39.000000000 +0000
@@ -1,4 +1,4 @@
-firefox-trunk (71.0~a1~hg20190913r492975-0ubuntu0.19.04.1~umd1) disco; urgency=emergency
+firefox-trunk (71.0~a1~hg20190915r493291-0ubuntu0.19.04.1~umd1) disco; urgency=emergency
 
   [ Olivier Tilloy, Rico Tzschichholz ]
   * Build with clang, as official firefox builds are now produced with clang
@@ -11,7 +11,7 @@
   [ Rico Tzschichholz ]
   * New upstream snapshot
 
- -- Rico Tzschichholz <ricotz@ubuntu.com>  Fri, 13 Sep 2019 07:29:52 +0200
+ -- Rico Tzschichholz <ricotz@ubuntu.com>  Sun, 15 Sep 2019 13:55:39 +0200
 
 firefox-trunk (70.0~a1~hg20190831r491013-0ubuntu1) eoan; urgency=medium
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/debian/patches/partially-revert-google-search-update.patch firefox-trunk-71.0~a1~hg20190915r493291/debian/patches/partially-revert-google-search-update.patch
--- firefox-trunk-71.0~a1~hg20190913r492975/debian/patches/partially-revert-google-search-update.patch	2019-07-14 08:30:43.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/debian/patches/partially-revert-google-search-update.patch	2019-09-15 11:51:31.000000000 +0000
@@ -1,9 +1,9 @@
 # https://bugzilla.mozilla.org/show_bug.cgi?id=1510296
 # https://hg.mozilla.org/releases/mozilla-beta/rev/fea77d171e0f
 
-diff -r d6eed298a41b browser/components/search/extensions/list.json
---- a/browser/components/search/extensions/list.json	Sun Jul 14 00:54:25 2019 +0300
-+++ b/browser/components/search/extensions/list.json	Sun Jul 14 10:30:27 2019 +0200
+diff -r c969a93b0ca7 browser/components/search/extensions/list.json
+--- a/browser/components/search/extensions/list.json	Sun Sep 15 03:01:37 2019 +0000
++++ b/browser/components/search/extensions/list.json	Sun Sep 15 13:51:14 2019 +0200
 @@ -3,12 +3,12 @@
      "searchDefault": "Google",
      "searchOrder": ["Google", "Bing"],
@@ -93,7 +93,7 @@
          ]
        },
        "BY": {
-@@ -158,63 +158,63 @@
+@@ -158,70 +158,70 @@
      "bg": {
        "default": {
          "visibleDefaultEngines": [
@@ -150,6 +150,14 @@
          ]
        }
      },
+     "ca-valencia": {
+       "default": {
+         "visibleDefaultEngines": [
+-          "google-b-d", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca"
++          "google", "bing", "diec2", "ddg", "ebay-es", "twitter", "wikipedia-ca"
+         ]
+       }
+     },
      "cak": {
        "default": {
          "visibleDefaultEngines": [
@@ -166,7 +174,7 @@
          ]
        }
      },
-@@ -222,72 +222,72 @@
+@@ -229,72 +229,72 @@
        "default": {
          "searchOrder": ["Google", "Seznam"],
          "visibleDefaultEngines": [
@@ -250,7 +258,7 @@
          ],
          "searchDefault": "Yandex"
        },
-@@ -300,30 +300,30 @@
+@@ -307,30 +307,30 @@
      "en-GB": {
        "default": {
          "visibleDefaultEngines": [
@@ -286,7 +294,7 @@
          ],
          "searchDefault": "Yandex"
        },
-@@ -336,30 +336,30 @@
+@@ -343,30 +343,30 @@
      "en-ZA": {
        "default": {
          "visibleDefaultEngines": [
@@ -322,7 +330,7 @@
          ],
          "searchDefault": "Yandex"
        }
-@@ -367,35 +367,35 @@
+@@ -374,35 +374,35 @@
      "eo": {
        "default": {
          "visibleDefaultEngines": [
@@ -363,7 +371,7 @@
          ]
        },
        "experimental-hidden": {
-@@ -407,49 +407,49 @@
+@@ -414,49 +414,49 @@
      "et": {
        "default": {
          "visibleDefaultEngines": [
@@ -420,7 +428,7 @@
          ]
        },
        "experimental-hidden": {
-@@ -461,105 +461,105 @@
+@@ -468,105 +468,105 @@
      "ga-IE": {
        "default": {
          "visibleDefaultEngines": [
@@ -541,7 +549,7 @@
          ]
        }
      },
-@@ -567,7 +567,7 @@
+@@ -574,7 +574,7 @@
        "default": {
          "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"],
          "visibleDefaultEngines": [
@@ -550,7 +558,7 @@
          ]
        }
      },
-@@ -575,28 +575,28 @@
+@@ -582,28 +582,28 @@
        "default": {
          "searchOrder": ["Google", "Yahoo! JAPAN", "Bing", "Amazon.co.jp", "楽天市場", "ヤフオク!", "教えて！goo", "Twitter", "Wikipedia (ja)"],
          "visibleDefaultEngines": [
@@ -583,7 +591,7 @@
          ]
        },
        "KZ": {
-@@ -615,119 +615,119 @@
+@@ -622,119 +622,119 @@
      "km": {
        "default": {
          "visibleDefaultEngines": [
@@ -720,7 +728,7 @@
          ]
        },
        "experimental-hidden": {
-@@ -739,70 +739,70 @@
+@@ -746,70 +746,70 @@
      "nn-NO": {
        "default": {
          "visibleDefaultEngines": [
@@ -801,7 +809,7 @@
          ]
        },
        "RU": {
-@@ -821,84 +821,84 @@
+@@ -828,84 +828,84 @@
      "si": {
        "default": {
          "visibleDefaultEngines": [
@@ -898,7 +906,7 @@
          ]
        },
        "TR": {
-@@ -917,56 +917,56 @@
+@@ -924,56 +924,56 @@
      "trs": {
        "default": {
          "visibleDefaultEngines": [
@@ -963,7 +971,7 @@
          ]
        },
        "CN": {
-@@ -976,7 +976,7 @@
+@@ -983,7 +983,7 @@
      "zh-TW": {
        "default": {
          "visibleDefaultEngines": [
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/debian/patches/unity-menubar.patch firefox-trunk-71.0~a1~hg20190915r493291/debian/patches/unity-menubar.patch
--- firefox-trunk-71.0~a1~hg20190913r492975/debian/patches/unity-menubar.patch	2019-08-23 06:42:45.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/debian/patches/unity-menubar.patch	2019-09-14 05:44:11.000000000 +0000
@@ -11,10 +11,10 @@
 +#endif
                                    this.setAttribute('openedwithkey',
                                                      event.target.parentNode.openedWithKey);">
-             <menu id="file-menu" label="&fileMenu.label;"
+             <menu id="file-menu" data-l10n-id="menu-file">
 --- a/browser/base/content/browser.js
 +++ b/browser/base/content/browser.js
-@@ -6809,11 +6809,17 @@ function onViewToolbarsPopupShowing(aEve
+@@ -6796,11 +6796,17 @@ function onViewToolbarsPopupShowing(aEve
  
    let toolbarNodes = gNavToolbox.querySelectorAll("toolbar");
  
@@ -74,7 +74,7 @@
  
  include('/ipc/chromium/chromium-config.mozbuild')
  
-+if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
++if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
 +    LOCAL_INCLUDES += [
 +        '/widget/gtk',
 +    ]
@@ -88,7 +88,7 @@
          '/dom/system',
          '/dom/system/android',
      ]
-+elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
++elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk':
 +    LOCAL_INCLUDES += [
 +        '/widget/gtk',
 +    ]
@@ -97,10 +97,10 @@
      'components.conf',
 --- a/modules/libpref/init/all.js
 +++ b/modules/libpref/init/all.js
-@@ -196,6 +196,9 @@ pref("dom.script_loader.binast_encoding.
+@@ -327,6 +327,9 @@ pref("dom.inputevent.datatransfer.enable
+ // of content viewers to cache based on the amount of available memory.
  pref("browser.sessionhistory.max_total_viewers", -1);
  
- pref("ui.use_native_colors", true);
 +#ifdef MOZ_WIDGET_GTK
 +pref("ui.use_unity_menubar", true);
 +#endif
@@ -3061,7 +3061,7 @@
 +#endif /* __nsMenuItem_h__ */
 --- /dev/null
 +++ b/widget/gtk/nsMenuObject.cpp
-@@ -0,0 +1,663 @@
+@@ -0,0 +1,664 @@
 +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 +/* vim:expandtab:shiftwidth=4:tabstop=4:
 + */
@@ -3261,7 +3261,8 @@
 +        imageRequest = list->GetListStyleImage();
 +        if (imageRequest) {
 +            imageRequest->GetURI(getter_AddRefs(uri));
-+            imageRect = list->mImageRegion.ToNearestPixels(
++            auto& rect = list->mImageRegion.AsRect();
++            imageRect = rect.ToLayoutRect().ToNearestPixels(
 +                            pc->AppUnitsPerDevPixel());
 +        }
 +    }
@@ -3304,7 +3305,7 @@
 +            return;
 +        }
 +
-+        loader->LoadImage(uri, nullptr, nullptr, mozilla::net::RP_Unset,
++        loader->LoadImage(uri, nullptr, nullptr,
 +                          nullptr, 0, loadGroup, this, nullptr, nullptr,
 +                          nsIRequest::LOAD_NORMAL, nullptr,
 +                          nsIContentPolicy::TYPE_IMAGE, EmptyString(),
@@ -5134,7 +5135,7 @@
 +#endif /* __nsNativeMenuService_h__ */
 --- a/widget/gtk/nsWindow.cpp
 +++ b/widget/gtk/nsWindow.cpp
-@@ -71,6 +71,7 @@
+@@ -73,6 +73,7 @@
  
  #include "mozilla/Assertions.h"
  #include "mozilla/Likely.h"
@@ -5142,7 +5143,7 @@
  #include "mozilla/Preferences.h"
  #include "nsIPrefService.h"
  #include "nsIServiceManager.h"
-@@ -5123,6 +5124,10 @@ void nsWindow::HideWindowChrome(bool aSh
+@@ -5174,6 +5175,10 @@ void nsWindow::HideWindowChrome(bool aSh
    SetWindowDecoration(aShouldHide ? eBorderStyle_none : mBorderStyle);
  }
  
@@ -5173,7 +5174,7 @@
    /**
     * GetLastUserInputTime returns a timestamp for the most recent user input
     * event.  This is intended for pointer grab requests (including drags).
-@@ -635,6 +639,8 @@ class nsWindow final : public nsBaseWidg
+@@ -637,6 +641,8 @@ class nsWindow final : public nsBaseWidg
  
    mozilla::UniquePtr<mozilla::CurrentX11TimeGetter> mCurrentTimeGetter;
    static CSDSupportLevel sCSDSupportLevel;
@@ -5192,7 +5193,7 @@
 -        'nsINativeMenuService.h',
 -    ]
 +
-+if toolkit in ('cocoa', 'gtk3'):
++if toolkit in ('cocoa', 'gtk'):
 +    EXPORTS += ['nsINativeMenuService.h']
  
  TEST_DIRS += ['tests']
@@ -5230,7 +5231,7 @@
  import sys
  
  # Static atom definitions, used to generate nsGkAtomList.h.
-@@ -2478,7 +2479,7 @@ STATIC_ATOMS = [
+@@ -2481,7 +2482,7 @@ STATIC_ATOMS = [
      InheritingAnonBoxAtom("AnonBox_mozSVGForeignContent", ":-moz-svg-foreign-content"),
      InheritingAnonBoxAtom("AnonBox_mozSVGText", ":-moz-svg-text"),
      # END ATOMS
@@ -5241,7 +5242,7 @@
  def verify():
 --- a/widget/gtk/components.conf
 +++ b/widget/gtk/components.conf
-@@ -75,6 +75,14 @@ Classes = [
+@@ -82,6 +82,14 @@ Classes = [
          'headers': ['/widget/gtk/nsApplicationChooser.h'],
          'processes': ProcessSelector.MAIN_PROCESS_ONLY,
      },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/application.css firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/application.css
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/application.css	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/application.css	2019-09-15 11:33:07.000000000 +0000
@@ -14,6 +14,7 @@
 @import "resource://devtools/client/application/src/components/manifest/ManifestIssue.css";
 @import "resource://devtools/client/application/src/components/manifest/ManifestIssueList.css";
 @import "resource://devtools/client/application/src/components/manifest/ManifestItem.css";
+@import "resource://devtools/client/application/src/components/manifest/ManifestJsonLink.css";
 @import "resource://devtools/client/application/src/components/manifest/ManifestLoader.css";
 @import "resource://devtools/client/application/src/components/manifest/ManifestSection.css";
 @import "resource://devtools/client/application/src/components/routing/PageSwitcher.css";
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/src/components/manifest/Manifest.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/src/components/manifest/Manifest.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/src/components/manifest/Manifest.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/src/components/manifest/Manifest.js	2019-09-15 11:33:07.000000000 +0000
@@ -23,6 +23,7 @@
 const ManifestItem = createFactory(require("./ManifestItem"));
 const ManifestIssueList = createFactory(require("./ManifestIssueList"));
 const ManifestSection = createFactory(require("./ManifestSection"));
+const ManifestJsonLink = createFactory(require("./ManifestJsonLink"));
 
 /**
  * A canonical manifest, splitted in different sections
@@ -36,6 +37,7 @@
       identity: PropTypes.array.isRequired,
       presentation: PropTypes.array.isRequired,
       validation: PropTypes.array.isRequired,
+      url: PropTypes.string.isRequired,
     };
   }
 
@@ -89,6 +91,8 @@
   }
 
   render() {
+    const { url } = this.props;
+
     return article(
       { className: "js-manifest" },
       Localized(
@@ -97,6 +101,7 @@
         },
         h1({ className: "app-page__title" })
       ),
+      ManifestJsonLink({ url }),
       this.renderIssueSection(),
       this.renderItemSections()
     );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/src/components/manifest/ManifestJsonLink.css firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/src/components/manifest/ManifestJsonLink.css
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/src/components/manifest/ManifestJsonLink.css	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/src/components/manifest/ManifestJsonLink.css	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,9 @@
+/* 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/. */
+
+.manifest-json-link {
+  /* this is so it has an implicit width and the link inside gets to truncate
+     with an ellipsis */
+  display: grid;
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/src/components/manifest/ManifestJsonLink.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/src/components/manifest/ManifestJsonLink.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/src/components/manifest/ManifestJsonLink.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/src/components/manifest/ManifestJsonLink.js	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,64 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { openDocLink } = require("devtools/client/shared/link");
+
+const PropTypes = require("devtools/client/shared/vendor/react-prop-types");
+const {
+  createFactory,
+  PureComponent,
+} = require("devtools/client/shared/vendor/react");
+
+const { a, p } = require("devtools/client/shared/vendor/react-dom-factories");
+
+const FluentReact = require("devtools/client/shared/vendor/fluent-react");
+const Localized = createFactory(FluentReact.Localized);
+
+/**
+ * This component displays an "Open JSON" link for the Manifest
+ */
+class ManifestJsonLink extends PureComponent {
+  static get propTypes() {
+    return {
+      url: PropTypes.string.isRequired,
+    };
+  }
+
+  get shouldRenderLink() {
+    const { url } = this.props;
+    // Firefox blocks the loading of Data URLs with mimetypes manifest+json unless
+    // explicitly typed by the user in the address bar.
+    // So we are not showing the link in this case.
+    // See more details in this post:
+    // https://blog.mozilla.org/security/2017/11/27/blocking-top-level-navigations-data-urls-firefox-59/
+    return !url.startsWith("data:");
+  }
+
+  renderLink() {
+    const { url } = this.props;
+
+    return a(
+      {
+        className: "js-manifest-json-link devtools-ellipsis-text",
+        href: "#",
+        title: url,
+        onClick: () => openDocLink(url),
+      },
+      url
+    );
+  }
+
+  render() {
+    return p(
+      { className: "manifest-json-link" },
+      this.shouldRenderLink
+        ? this.renderLink()
+        : Localized({ id: "manifest-json-link-data-url" })
+    );
+  }
+}
+
+module.exports = ManifestJsonLink;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/src/components/manifest/moz.build firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/src/components/manifest/moz.build
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/src/components/manifest/moz.build	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/src/components/manifest/moz.build	2019-09-15 11:33:07.000000000 +0000
@@ -11,6 +11,8 @@
 	'ManifestIssueList.js',
     'ManifestItem.css',
     'ManifestItem.js',
+    'ManifestJsonLink.css',
+    'ManifestJsonLink.js',
     'ManifestLoader.css',
     'ManifestLoader.js',
     'ManifestPage.js',
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/browser/browser_application_panel_manifest-open-json.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/browser/browser_application_panel_manifest-open-json.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/browser/browser_application_panel_manifest-open-json.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/browser/browser_application_panel_manifest-open-json.js	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,67 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * Check that the application panel fetches a manifest when in the Manifest Page
+ */
+
+add_task(async function() {
+  info("Test that manifest page has a link that opens the manifest JSON file");
+  const url = URL_ROOT + "resources/manifest/load-ok-manifest-link.html";
+  const manifestUrl = URL_ROOT + "resources/manifest/manifest.json";
+
+  await enableApplicationPanel();
+  const { panel, tab } = await openNewTabAndApplicationPanel(url);
+  const doc = panel.panelWin.document;
+
+  selectPage(panel, "manifest");
+
+  info("Waiting for the manifest JSON link");
+  await waitUntil(() => doc.querySelector(".js-manifest-json-link") !== null);
+  ok(true, "Link to JSON is displayed");
+
+  info("Click on link and wait till the JSON is opened in a new tab");
+  // click on the link and wait for the new tab to open
+  const onTabLoaded = BrowserTestUtils.waitForNewTab(
+    gBrowser,
+    `${manifestUrl}`
+  );
+  const link = doc.querySelector(".js-manifest-json-link");
+  link.click();
+  const jsonTab = await onTabLoaded;
+  ok(jsonTab, "The manifest JSON was opened in a new tab");
+
+  // close the tabs
+  info("Closing the page tab.");
+  await BrowserTestUtils.removeTab(tab);
+  info("Closing the manifest JSON tab.");
+  await BrowserTestUtils.removeTab(jsonTab);
+});
+
+add_task(async function() {
+  info(
+    "Test that manifest page does not show a link for manifests embedded in a data url"
+  );
+  const url = URL_ROOT + "resources/manifest/load-ok.html";
+
+  await enableApplicationPanel();
+  const { panel, tab } = await openNewTabAndApplicationPanel(url);
+  const doc = panel.panelWin.document;
+
+  selectPage(panel, "manifest");
+
+  info("Waiting for the manifest to load");
+  await waitUntil(() => doc.querySelector(".js-manifest") !== null);
+  ok(true, "Manifest loaded successfully");
+  is(
+    doc.querySelector(".js-manifest-json-link"),
+    null,
+    "No JSON link is shown"
+  );
+
+  // close tab
+  info("Closing the tab");
+  await BrowserTestUtils.removeTab(tab);
+});
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/browser/browser.ini firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/browser/browser.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/browser/browser.ini	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/browser/browser.ini	2019-09-15 11:33:07.000000000 +0000
@@ -7,8 +7,10 @@
   resources/manifest/load-fail.html
   resources/manifest/load-no-manifest.html
   resources/manifest/load-ok-json-error.html
+  resources/manifest/load-ok-manifest-link.html
   resources/manifest/load-ok-warnings.html
   resources/manifest/load-ok.html
+  resources/manifest/manifest.json
   resources/service-workers/debug-sw.js
   resources/service-workers/debug.html
   resources/service-workers/dynamic-registration.html
@@ -37,6 +39,7 @@
 skip-if = debug # Bug 1559591
 [browser_application_panel_manifest-display.js]
 [browser_application_panel_manifest-load.js]
+[browser_application_panel_manifest-open-json.js]
 [browser_application_panel_manifest-reload.js]
 [browser_application_panel_open-links.js]
 skip-if = true # Bug 1467256, 1559591
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/browser/resources/manifest/load-ok-manifest-link.html firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/browser/resources/manifest/load-ok-manifest-link.html
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/browser/resources/manifest/load-ok-manifest-link.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/browser/resources/manifest/load-ok-manifest-link.html	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,9 @@
+<!doctype html>
+<head>
+  <meta charset="utf-8">
+  <title>Successful load for a linked manifest</title>
+  <link rel="manifest" href='manifest.json'>
+</head>
+<body>
+<h1>Manifest OK (linked manifest)</h1>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/browser/resources/manifest/manifest.json firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/browser/resources/manifest/manifest.json
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/browser/resources/manifest/manifest.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/browser/resources/manifest/manifest.json	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,3 @@
+{
+  "name": "Foo"
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/components/manifest/components_application_panel-ManifestJsonLink.test.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/components/manifest/components_application_panel-ManifestJsonLink.test.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/components/manifest/components_application_panel-ManifestJsonLink.test.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/components/manifest/components_application_panel-ManifestJsonLink.test.js	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,36 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+// Import libs
+const { shallow } = require("enzyme");
+const { createFactory } = require("react");
+
+const ManifestJsonLink = createFactory(
+  require("devtools/client/application/src/components/manifest/ManifestJsonLink")
+);
+
+/*
+ * Test for the ManifestJsonLink component
+ */
+
+describe("ManifestJsonLink", () => {
+  it("renders the expected snapshot when given a regular URL", () => {
+    const wrapper = shallow(
+      ManifestJsonLink({ url: "https://example.com/manifest.json" })
+    );
+    expect(wrapper).toMatchSnapshot();
+  });
+
+  it("renders the expected snapshot when given a data URL", () => {
+    const wrapper = shallow(
+      ManifestJsonLink({
+        url: `data:application/manifest+json,{"name": "Foo"}`,
+      })
+    );
+    expect(wrapper).toMatchSnapshot();
+    // assert there's no link for data URLs
+    expect(wrapper.find("a").length).toBe(0);
+  });
+});
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/components/manifest/__snapshots__/components_application_panel-ManifestJsonLink.test.js.snap firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/components/manifest/__snapshots__/components_application_panel-ManifestJsonLink.test.js.snap
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/components/manifest/__snapshots__/components_application_panel-ManifestJsonLink.test.js.snap	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/components/manifest/__snapshots__/components_application_panel-ManifestJsonLink.test.js.snap	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ManifestJsonLink renders the expected snapshot when given a data URL 1`] = `
+<p
+  className="manifest-json-link"
+>
+  <Localized
+    id="manifest-json-link-data-url"
+  />
+</p>
+`;
+
+exports[`ManifestJsonLink renders the expected snapshot when given a regular URL 1`] = `
+<p
+  className="manifest-json-link"
+>
+  <a
+    className="js-manifest-json-link devtools-ellipsis-text"
+    href="#"
+    onClick={[Function]}
+    title="https://example.com/manifest.json"
+  >
+    https://example.com/manifest.json
+  </a>
+</p>
+`;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/components/manifest/__snapshots__/components_application_panel-Manifest.test.js.snap firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/components/manifest/__snapshots__/components_application_panel-Manifest.test.js.snap
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/application/test/components/manifest/__snapshots__/components_application_panel-Manifest.test.js.snap	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/application/test/components/manifest/__snapshots__/components_application_panel-Manifest.test.js.snap	2019-09-15 11:33:07.000000000 +0000
@@ -11,6 +11,7 @@
       className="app-page__title"
     />
   </Localized>
+  <ManifestJsonLink />
   <ManifestSection
     key="manifest-section-1"
     title="manifest-item-identity"
@@ -76,6 +77,7 @@
       className="app-page__title"
     />
   </Localized>
+  <ManifestJsonLink />
   <ManifestSection
     key="manifest-section-0"
     title="manifest-item-warnings"
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/actions.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/actions.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/actions.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/actions.js	2019-09-15 11:33:07.000000000 +0000
@@ -7,7 +7,8 @@
 import type { GripProperties, Node, Props, ReduxAction } from "./types";
 
 const { loadItemProperties } = require("./utils/load-properties");
-const { getLoadedProperties, getActors } = require("./reducer");
+const { getPathExpression, getValue } = require("./utils/node");
+const { getLoadedProperties, getActors, getWatchpoints } = require("./reducer");
 
 type Dispatch = ReduxAction => void;
 
@@ -73,6 +74,50 @@
   };
 }
 
+/*
+ * This action adds a property watchpoint to an object
+ */
+function addWatchpoint(item, watchpoint: string) {
+  return async function({ dispatch, client }: ThunkArgs) {
+    const { parent, name } = item;
+    const object = getValue(parent);
+    if (!object) {
+      return;
+    }
+
+    const path = parent.path;
+    const property = name;
+    const label = getPathExpression(item);
+    const actor = object.actor;
+
+    await client.addWatchpoint(object, property, label, watchpoint);
+
+    dispatch({
+      type: "SET_WATCHPOINT",
+      data: { path, watchpoint, property, actor },
+    });
+  };
+}
+
+/*
+ * This action removes a property watchpoint from an object
+ */
+function removeWatchpoint(item) {
+  return async function({ dispatch, client }: ThunkArgs) {
+    const object = getValue(item.parent);
+    const property = item.name;
+    const path = item.parent.path;
+    const actor = object.actor;
+
+    await client.removeWatchpoint(object, property);
+
+    dispatch({
+      type: "REMOVE_WATCHPOINT",
+      data: { path, property, actor },
+    });
+  };
+}
+
 function closeObjectInspector() {
   return async ({ getState, client }: ThunkArg) => {
     releaseActors(getState(), client);
@@ -99,8 +144,14 @@
 
 function releaseActors(state, client) {
   const actors = getActors(state);
+  const watchpoints = getWatchpoints(state);
+
   for (const actor of actors) {
-    client.releaseActor(actor);
+    // Watchpoints are stored in object actors.
+    // If we release the actor we lose the watchpoint.
+    if (!watchpoints.has(actor)) {
+      client.releaseActor(actor);
+    }
   }
 }
 
@@ -138,4 +189,6 @@
   nodeLoadProperties,
   nodePropertiesLoaded,
   rootsChanged,
+  addWatchpoint,
+  removeWatchpoint,
 };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.css firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.css
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.css	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.css	2019-09-15 11:33:07.000000000 +0000
@@ -55,3 +55,31 @@
 .tree-node.focused button.invoke-getter {
   background-color: currentColor;
 }
+
+button.remove-set-watchpoint {
+  mask: url("resource://devtools/client/debugger/images/webconsole-logpoint.svg")
+  no-repeat;
+  display: inline-block;
+  vertical-align: top;
+  height: 15px;
+  width: 15px;
+  margin: 0 4px 0px 20px;
+  padding: 0;
+  border: none;
+  background-color: var(--breakpoint-fill);
+  cursor: pointer;
+}
+
+button.remove-get-watchpoint {
+  mask: url("resource://devtools/client/debugger/images/webconsole-logpoint.svg")
+  no-repeat;
+  display: inline-block;
+  vertical-align: top;
+  height: 15px;
+  width: 15px;
+  margin: 0 4px 0px 20px;
+  padding: 0;
+  border: none;
+  background-color: var(--purple-60);
+  cursor: pointer;
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspectorItem.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspectorItem.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspectorItem.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspectorItem.js	2019-09-15 11:33:07.000000000 +0000
@@ -80,6 +80,12 @@
 };
 
 class ObjectInspectorItem extends Component<Props> {
+  static get defaultProps() {
+    return {
+      onContextMenu: () => {},
+    };
+  }
+
   // eslint-disable-next-line complexity
   getLabelAndValue(): {
     value?: string | Element,
@@ -203,6 +209,7 @@
       onCmdCtrlClick,
       onDoubleClick,
       dimTopLevelWindow,
+      onContextMenu,
     } = this.props;
 
     const parentElementProps: Object = {
@@ -245,6 +252,7 @@
           e.stopPropagation();
         }
       },
+      onContextMenu: e => onContextMenu(e, item),
     };
 
     if (onDoubleClick) {
@@ -292,6 +300,21 @@
     );
   }
 
+  renderWatchpointButton() {
+    const { item, removeWatchpoint } = this.props;
+
+    if (!item || !item.contents || !item.contents.watchpoint) {
+      return;
+    }
+
+    const watchpoint = item.contents.watchpoint;
+    return dom.button({
+      className: `remove-${watchpoint}-watchpoint`,
+      title: L10N.getStr("watchpoints.removeWatchpoint"),
+      onClick: () => removeWatchpoint(item),
+    });
+  }
+
   render() {
     const { arrow } = this.props;
 
@@ -307,7 +330,8 @@
       arrow,
       labelElement,
       delimiter,
-      value
+      value,
+      this.renderWatchpointButton()
     );
   }
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/components/ObjectInspector.js	2019-09-15 11:33:07.000000000 +0000
@@ -110,6 +110,12 @@
       return;
     }
 
+    for (const [path, properties] of nextProps.loadedProperties) {
+      if (properties !== this.props.loadedProperties.get(path)) {
+        this.cachedNodes.delete(path);
+      }
+    }
+
     // If there are new evaluations, we want to remove the existing cached
     // nodes from the cache.
     if (nextProps.evaluations > this.props.evaluations) {
@@ -134,6 +140,7 @@
     // - OR the focused node changed.
     // - OR the active node changed.
     return (
+      loadedProperties !== nextProps.loadedProperties ||
       loadedProperties.size !== nextProps.loadedProperties.size ||
       evaluations.size !== nextProps.evaluations.size ||
       (expandedPaths.size !== nextProps.expandedPaths.size &&
@@ -271,7 +278,6 @@
       autoExpandAll,
       autoExpandDepth,
       initiallyExpanded,
-
       isExpanded: item => expandedPaths && expandedPaths.has(item.path),
       isExpandable: this.isNodeExpandable,
       focused: this.focusedItem,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/index.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/index.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/index.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/index.js	2019-09-15 11:33:07.000000000 +0000
@@ -5,5 +5,6 @@
 const ObjectInspector = require("./components/ObjectInspector");
 const utils = require("./utils");
 const reducer = require("./reducer");
+const actions = require("./actions");
 
-module.exports = { ObjectInspector, utils, reducer };
+module.exports = { ObjectInspector, utils, actions, reducer };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/reducer.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/reducer.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/reducer.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/reducer.js	2019-09-15 11:33:07.000000000 +0000
@@ -4,12 +4,14 @@
 
 import type { ReduxAction, State } from "./types";
 
-function initialState() {
+function initialState(overrides) {
   return {
     expandedPaths: new Set(),
     loadedProperties: new Map(),
     evaluations: new Map(),
     actors: new Set(),
+    watchpoints: new Map(),
+    ...overrides,
   };
 }
 
@@ -33,6 +35,34 @@
     return cloneState({ expandedPaths });
   }
 
+  if (type == "SET_WATCHPOINT") {
+    const { watchpoint, property, path } = data;
+    const obj = state.loadedProperties.get(path);
+
+    return cloneState({
+      loadedProperties: new Map(state.loadedProperties).set(
+        path,
+        updateObject(obj, property, watchpoint)
+      ),
+      watchpoints: new Map(state.watchpoints).set(data.actor, data.watchpoint),
+    });
+  }
+
+  if (type === "REMOVE_WATCHPOINT") {
+    const { path, property, actor } = data;
+    const obj = state.loadedProperties.get(path);
+    const watchpoints = new Map(state.watchpoints);
+    watchpoints.delete(actor);
+
+    return cloneState({
+      loadedProperties: new Map(state.loadedProperties).set(
+        path,
+        updateObject(obj, property, null)
+      ),
+      watchpoints: watchpoints,
+    });
+  }
+
   if (type === "NODE_PROPERTIES_LOADED") {
     return cloneState({
       actors: data.actor
@@ -66,12 +96,25 @@
   // NOTE: we clear the state on resume because otherwise the scopes pane
   // would be out of date. Bug 1514760
   if (type === "RESUME" || type == "NAVIGATE") {
-    return initialState();
+    return initialState({ watchpoints: state.watchpoints });
   }
 
   return state;
 }
 
+function updateObject(obj, property, watchpoint) {
+  return {
+    ...obj,
+    ownProperties: {
+      ...obj.ownProperties,
+      [property]: {
+        ...obj.ownProperties[property],
+        watchpoint,
+      },
+    },
+  };
+}
+
 function getObjectInspectorState(state) {
   return state.objectInspector;
 }
@@ -88,6 +131,10 @@
   return getObjectInspectorState(state).actors;
 }
 
+function getWatchpoints(state) {
+  return getObjectInspectorState(state).watchpoints;
+}
+
 function getLoadedProperties(state) {
   return getObjectInspectorState(state).loadedProperties;
 }
@@ -102,6 +149,7 @@
 
 const selectors = {
   getActors,
+  getWatchpoints,
   getEvaluations,
   getExpandedPathKeys,
   getExpandedPaths,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/release-actors.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/release-actors.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/release-actors.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/release-actors.js	2019-09-15 11:33:07.000000000 +0000
@@ -61,6 +61,7 @@
       {
         initialState: {
           actors: new Set(["actor 1", "actor 2"]),
+          watchpoints: new Map(),
         },
       }
     );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/classnames.js.snap firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/classnames.js.snap
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/classnames.js.snap	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/classnames.js.snap	2019-09-15 11:33:07.000000000 +0000
@@ -24,6 +24,7 @@
     <div
       className="node object-node"
       onClick={[Function]}
+      onContextMenu={[Function]}
     >
       <span
         className="object-label"
@@ -69,6 +70,7 @@
     <div
       className="node object-node"
       onClick={[Function]}
+      onContextMenu={[Function]}
     >
       <span
         className="object-label"
@@ -114,6 +116,7 @@
     <div
       className="node object-node"
       onClick={[Function]}
+      onContextMenu={[Function]}
     >
       <span
         className="object-label"
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/component/__snapshots__/window.js.snap	2019-09-15 11:33:07.000000000 +0000
@@ -25,6 +25,7 @@
     <div
       className="node object-node"
       onClick={[Function]}
+      onContextMenu={[Function]}
     >
       <button
         className="arrow"
@@ -80,6 +81,7 @@
     <div
       className="node object-node focused"
       onClick={[Function]}
+      onContextMenu={[Function]}
     >
       <button
         className="arrow expanded"
@@ -109,6 +111,7 @@
     <div
       className="node object-node"
       onClick={[Function]}
+      onContextMenu={[Function]}
     >
       <button
         className="arrow"
@@ -163,6 +166,7 @@
     <div
       className="node object-node lessen"
       onClick={[Function]}
+      onContextMenu={[Function]}
     >
       <button
         className="arrow"
@@ -218,6 +222,7 @@
     <div
       className="node object-node focused"
       onClick={[Function]}
+      onContextMenu={[Function]}
     >
       <button
         className="arrow expanded"
@@ -261,6 +266,7 @@
     <div
       className="node object-node lessen"
       onClick={[Function]}
+      onContextMenu={[Function]}
     >
       <span
         className="object-label"
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/make-numerical-buckets.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/make-numerical-buckets.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/make-numerical-buckets.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/tests/utils/make-numerical-buckets.js	2019-09-15 11:33:07.000000000 +0000
@@ -20,11 +20,7 @@
 
     expect(names).toEqual(["[0…99]", "[100…199]", "[200…233]"]);
 
-    expect(paths).toEqual([
-      "root◦[0…99]",
-      "root◦[100…199]",
-      "root◦[200…233]",
-    ]);
+    expect(paths).toEqual(["root◦[0…99]", "root◦[100…199]", "root◦[200…233]"]);
   });
 
   // TODO: Re-enable when we have support for lonely node.
@@ -60,10 +56,7 @@
 
     expect(names).toEqual(["[0…99]", "[100…101]"]);
 
-    expect(paths).toEqual([
-      "root◦bucket_0-99",
-      "root◦bucket_100-101",
-    ]);
+    expect(paths).toEqual(["root◦bucket_0-99", "root◦bucket_100-101"]);
   });
 
   it("creates sub-buckets when needed", () => {
@@ -134,9 +127,7 @@
       "[23300…23399]",
       "[23400…23455]",
     ]);
-    expect(lastBucketPaths[0]).toEqual(
-      "root◦[23000…23455]◦[23000…23099]"
-    );
+    expect(lastBucketPaths[0]).toEqual("root◦[23000…23455]◦[23000…23099]");
     expect(lastBucketPaths[lastBucketPaths.length - 1]).toEqual(
       "root◦[23000…23455]◦[23400…23455]"
     );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/node.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/node.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/node.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/packages/devtools-reps/src/object-inspector/utils/node.js	2019-09-15 11:33:07.000000000 +0000
@@ -816,6 +816,15 @@
   return addToCache(makeNodesForProperties(loadedProps, item));
 }
 
+// Builds an expression that resolves to the value of the item in question
+// e.g. `b` in { a: { b: 2 } } resolves to `a.b`
+function getPathExpression(item) {
+  if (item && item.parent) {
+    return `${getPathExpression(item.parent)}.${item.name}`;
+  }
+  return item.name;
+}
+
 function getParent(item: Node): Node | null {
   return item.parent;
 }
@@ -922,6 +931,7 @@
   getChildrenWithEvaluations,
   getClosestGripNode,
   getClosestNonBucketNode,
+  getPathExpression,
   getParent,
   getParentGripValue,
   getNonPrototypeParentGripValue,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/actions/index.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/actions/index.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/actions/index.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/actions/index.js	2019-09-15 11:33:07.000000000 +0000
@@ -22,6 +22,9 @@
 import * as toolbox from "./toolbox";
 import * as preview from "./preview";
 
+// eslint-disable-next-line import/named
+import { objectInspector } from "devtools-reps";
+
 export default {
   ...ast,
   ...navigation,
@@ -34,6 +37,7 @@
   ...pause,
   ...ui,
   ...fileSearch,
+  ...objectInspector.actions,
   ...projectTextSearch,
   ...quickOpen,
   ...sourceTree,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/actions/pause/fetchScopes.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/actions/pause/fetchScopes.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/actions/pause/fetchScopes.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/actions/pause/fetchScopes.js	2019-09-15 11:33:07.000000000 +0000
@@ -27,7 +27,7 @@
     });
 
     scopes.then(() => {
-      dispatch(generateInlinePreview(cx, frame));
+      dispatch(generateInlinePreview(cx.thread, frame));
     });
     await dispatch(mapScopes(cx, scopes, frame));
   };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/actions/pause/inlinePreview.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/actions/pause/inlinePreview.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/actions/pause/inlinePreview.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/actions/pause/inlinePreview.js	2019-09-15 11:33:07.000000000 +0000
@@ -6,10 +6,9 @@
 import { sortBy } from "lodash";
 import { getOriginalFrameScope, getGeneratedFrameScope } from "../../selectors";
 import { features } from "../../utils/prefs";
-import { validateThreadContext } from "../../utils/context";
 
 import type { OriginalScope } from "../../utils/pause/mapScopes";
-import type { ThreadContext, Frame, Scope, Previews } from "../../types";
+import type { ThreadId, Frame, Scope, Previews } from "../../types";
 import type { ThunkArgs } from "../types";
 
 // We need to display all variables in the current functional scope so
@@ -25,13 +24,14 @@
   return levels;
 }
 
-export function generateInlinePreview(cx: ThreadContext, frame: ?Frame) {
+export function generateInlinePreview(thread: ThreadId, frame: ?Frame) {
   return async function({ dispatch, getState, parser, client }: ThunkArgs) {
     if (!frame || !features.inlinePreview) {
       return;
     }
 
-    const { thread } = cx;
+    const originalAstScopes = await parser.getScopes(frame.location);
+
     const originalFrameScopes = getOriginalFrameScope(
       getState(),
       thread,
@@ -49,18 +49,13 @@
       (originalFrameScopes && originalFrameScopes.scope) ||
       (generatedFrameScopes && generatedFrameScopes.scope);
 
-    if (!scopes || !scopes.bindings) {
-      return;
-    }
-
-    const originalAstScopes = await parser.getScopes(frame.location);
-    validateThreadContext(getState(), cx);
-    if (!originalAstScopes) {
+    if (!scopes || !scopes.bindings || !originalAstScopes) {
       return;
     }
 
     const previews: Previews = {};
     const pausedOnLine: number = frame.location.line;
+
     const levels: number = getLocalScopeLevels(originalAstScopes);
 
     for (
@@ -74,14 +69,13 @@
           bindings[key] = argument[key];
         });
       });
-
-      const previewBindings = Object.keys(bindings).map(async name => {
+      for (const name in bindings) {
         // We want to show values of properties of objects only and not
         // function calls on other data types like someArr.forEach etc..
         let properties = null;
         if (bindings[name].value.class === "Object") {
           const root = {
-            name,
+            name: name,
             path: name,
             contents: { value: bindings[name].value },
           };
@@ -97,22 +91,16 @@
           properties
         );
 
-        Object.keys(preview).forEach(line => {
+        for (const line in preview) {
           previews[line] = (previews[line] || []).concat(preview[line]);
-        });
-      });
-      await Promise.all(previewBindings);
+        }
+      }
 
       scopes = scopes.parent;
     }
 
-    Object.keys(previews).forEach(line => {
+    for (const line in previews) {
       previews[line] = sortBy(previews[line], ["column"]);
-    });
-
-    // Bail if there are no previews to display
-    if (Object.keys(previews).length == 0) {
-      return;
     }
 
     return dispatch({
@@ -213,12 +201,12 @@
         displayName += `.${meta.property}`;
       } else if (displayValue && displayValue.preview) {
         const { ownProperties } = displayValue.preview;
-        Object.keys(ownProperties).forEach(prop => {
+        for (const prop in ownProperties) {
           if (prop === meta.property) {
             displayValue = ownProperties[prop].value;
             displayName += `.${meta.property}`;
           }
-        });
+        }
       }
       meta = meta.parent;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/client/firefox/commands.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/client/firefox/commands.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/client/firefox/commands.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/client/firefox/commands.js	2019-09-15 11:33:07.000000000 +0000
@@ -188,6 +188,25 @@
   return currentThreadFront.removeXHRBreakpoint(path, method);
 }
 
+function addWatchpoint(
+  object: Grip,
+  property: string,
+  label: string,
+  watchpointType: string
+) {
+  if (currentTarget.traits.watchpoints) {
+    const objectClient = createObjectClient(object);
+    return objectClient.addWatchpoint(property, label, watchpointType);
+  }
+}
+
+function removeWatchpoint(object: Grip, property: string) {
+  if (currentTarget.traits.watchpoints) {
+    const objectClient = createObjectClient(object);
+    return objectClient.removeWatchpoint(property);
+  }
+}
+
 // Get the string key to use for a breakpoint location.
 // See also duplicate code in breakpoint-actor-map.js :(
 function locationKey(location: BreakpointLocation) {
@@ -514,6 +533,8 @@
   setBreakpoint,
   setXHRBreakpoint,
   removeXHRBreakpoint,
+  addWatchpoint,
+  removeWatchpoint,
   removeBreakpoint,
   evaluate,
   evaluateInFrame,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/client/firefox/types.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/client/firefox/types.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/client/firefox/types.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/client/firefox/types.js	2019-09-15 11:33:07.000000000 +0000
@@ -260,7 +260,7 @@
   connect: () => Promise<*>,
   request: (packet: Object) => Promise<*>,
   attachConsole: (actor: String, listeners: Array<*>) => Promise<*>,
-  createObjectClient: (grip: Grip) => {},
+  createObjectClient: (grip: Grip) => ObjectClient,
   release: (actor: String) => {},
 };
 
@@ -338,6 +338,12 @@
  */
 export type ObjectClient = {
   getPrototypeAndProperties: () => any,
+  addWatchpoint: (
+    property: string,
+    label: string,
+    watchpointType: string
+  ) => {},
+  removeWatchpoint: (property: string) => {},
 };
 
 /**
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/client/firefox.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/client/firefox.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/client/firefox.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/client/firefox.js	2019-09-15 11:33:07.000000000 +0000
@@ -45,6 +45,7 @@
     pauseWorkersUntilAttach: true,
     wasmBinarySource: supportsWasm,
     skipBreakpoints: prefs.skipPausing,
+    logEventBreakpoints: features.logEventBreakpoints,
   });
 
   // Retrieve possible event listener breakpoints
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/components/SecondaryPanes/Scopes.js	2019-09-15 11:33:07.000000000 +0000
@@ -4,9 +4,11 @@
 
 // @flow
 import React, { PureComponent } from "react";
+import { showMenu } from "devtools-contextmenu";
 import { connect } from "../../utils/connect";
 import actions from "../../actions";
 import { createObjectClient } from "../../client/firefox";
+import { features } from "../../utils/prefs";
 
 import {
   getSelectedSource,
@@ -45,6 +47,8 @@
   unHighlightDomElement: typeof actions.unHighlightDomElement,
   toggleMapScopes: typeof actions.toggleMapScopes,
   setExpandedScope: typeof actions.setExpandedScope,
+  addWatchpoint: typeof actions.addWatchpoint,
+  removeWatchpoint: typeof actions.removeWatchpoint,
   expandedScopes: string[],
 };
 
@@ -111,6 +115,50 @@
     this.props.toggleMapScopes();
   };
 
+  onContextMenu = (event, item) => {
+    const { addWatchpoint, removeWatchpoint } = this.props;
+
+    if (!features.watchpoints || !item.parent || !item.parent.contents) {
+      return;
+    }
+
+    if (!item.contents || item.contents.watchpoint) {
+      const removeWatchpointItem = {
+        id: "node-menu-remove-watchpoint",
+        // NOTE: we're going to update the UI to add a "break on..."
+        // sub menu. At that point we'll translate the strings. bug 1580591
+        label: "Remove watchpoint",
+        disabled: false,
+        click: () => removeWatchpoint(item),
+      };
+
+      const menuItems = [removeWatchpointItem];
+      return showMenu(event, menuItems);
+    }
+
+    // NOTE: we're going to update the UI to add a "break on..."
+    // sub menu. At that point we'll translate the strings. bug 1580591
+    const addSetWatchpointLabel = "Pause on set";
+    const addGetWatchpointLabel = "Pause on get";
+
+    const addSetWatchpoint = {
+      id: "node-menu-add-set-watchpoint",
+      label: addSetWatchpointLabel,
+      disabled: false,
+      click: () => addWatchpoint(item, "set"),
+    };
+
+    const addGetWatchpoint = {
+      id: "node-menu-add-get-watchpoint",
+      label: addGetWatchpointLabel,
+      disabled: false,
+      click: () => addWatchpoint(item, "get"),
+    };
+
+    const menuItems = [addGetWatchpoint, addSetWatchpoint];
+    showMenu(event, menuItems);
+  };
+
   renderScopesList() {
     const {
       cx,
@@ -147,6 +195,7 @@
             onInspectIconClick={grip => openElementInInspector(grip)}
             onDOMNodeMouseOver={grip => highlightDomElement(grip)}
             onDOMNodeMouseOut={grip => unHighlightDomElement(grip)}
+            onContextMenu={this.onContextMenu}
             setExpanded={(path, expand) => setExpandedScope(cx, path, expand)}
             initiallyExpanded={initiallyExpanded}
           />
@@ -223,5 +272,7 @@
     unHighlightDomElement: actions.unHighlightDomElement,
     toggleMapScopes: actions.toggleMapScopes,
     setExpandedScope: actions.setExpandedScope,
+    addWatchpoint: actions.addWatchpoint,
+    removeWatchpoint: actions.removeWatchpoint,
   }
 )(Scopes);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/reducers/pause.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/reducers/pause.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/reducers/pause.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/reducers/pause.js	2019-09-15 11:33:07.000000000 +0000
@@ -644,6 +644,16 @@
   ];
 }
 
+export function getSelectedInlinePreviews(state: State) {
+  const thread = getCurrentThread(state);
+  const frameId = getSelectedFrameId(state, thread);
+  if (!frameId) {
+    return null;
+  }
+
+  return getInlinePreviews(state, thread, frameId);
+}
+
 export function getInlinePreviewExpression(
   state: State,
   thread: ThreadId,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/utils/context.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/utils/context.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/utils/context.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/utils/context.js	2019-09-15 11:33:07.000000000 +0000
@@ -62,7 +62,7 @@
   }
 }
 
-export function validateThreadContext(state: State, cx: ThreadContext) {
+function validateThreadContext(state: State, cx: ThreadContext) {
   const newcx = getThreadContext(state);
 
   if (cx.thread != newcx.thread) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/utils/pause/why.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/utils/pause/why.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/utils/pause/why.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/utils/pause/why.js	2019-09-15 11:33:07.000000000 +0000
@@ -17,6 +17,8 @@
   resumeLimit: "whyPaused.resumeLimit",
   breakpointConditionThrown: "whyPaused.breakpointConditionThrown",
   eventBreakpoint: "whyPaused.eventBreakpoint",
+  getWatchpoint: "whyPaused.getWatchpoint",
+  setWatchpoint: "whyPaused.setWatchpoint",
   mutationBreakpoint: "whyPaused.mutationBreakpoint",
   interrupted: "whyPaused.interrupted",
   replayForcedPause: "whyPaused.replayForcedPause",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/utils/prefs.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/utils/prefs.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/src/utils/prefs.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/src/utils/prefs.js	2019-09-15 11:33:07.000000000 +0000
@@ -71,6 +71,8 @@
   pref("devtools.debugger.features.inline-preview", true);
   pref("devtools.debugger.log-actions", true);
   pref("devtools.debugger.features.overlay-step-buttons", true);
+  pref("devtools.debugger.features.log-event-breakpoints", false);
+  pref("devtools.debugger.features.watchpoints", false);
 }
 
 export const prefs = new PrefsHelper("devtools", {
@@ -136,8 +138,10 @@
   eventListenersBreakpoints: ["Bool", "event-listeners-breakpoints"],
   domMutationBreakpoints: ["Bool", "dom-mutation-breakpoints"],
   logPoints: ["Bool", "log-points"],
-  showOverlayStepButtons: ["Bool", "debugger.features.overlay-step-buttons"],
+  showOverlayStepButtons: ["Bool", "overlay-step-buttons"],
   inlinePreview: ["Bool", "inline-preview"],
+  logEventBreakpoints: ["Bool", "log-event-breakpoints"],
+  watchpoints: ["Bool", "watchpoints"],
 });
 
 export const asyncStore = asyncStoreHelper("debugger", {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/test/mochitest/browser_dbg-watchpoints.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/test/mochitest/browser_dbg-watchpoints.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/test/mochitest/browser_dbg-watchpoints.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/test/mochitest/browser_dbg-watchpoints.js	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,38 @@
+/* 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/>. */
+
+// Tests adding a watchpoint
+
+add_task(async function() {
+  pushPref("devtools.debugger.features.watchpoints", true);
+  const dbg = await initDebugger("doc-sources.html");
+
+  await navigate(dbg, "doc-watchpoints.html", "doc-watchpoints.html");
+  await selectSource(dbg, "doc-watchpoints.html");
+  await waitForPaused(dbg);
+
+  info(`Add a get watchpoint at b`);
+  await toggleScopeNode(dbg, 3);
+  const addedWatchpoint = waitForDispatch(dbg, "SET_WATCHPOINT");
+  await rightClickScopeNode(dbg, 5);
+  selectContextMenuItem(dbg, selectors.addGetWatchpoint);
+  await addedWatchpoint;
+
+  info(`Resume and wait to pause at the access to b on line 12`);
+  resume(dbg);
+  await waitForPaused(dbg);
+  await waitForState(dbg, () => dbg.selectors.getSelectedInlinePreviews());
+  assertPausedAtSourceAndLine(
+    dbg,
+    findSource(dbg, "doc-watchpoints.html").id,
+    12
+  );
+
+  const removedWatchpoint = waitForDispatch(dbg, "REMOVE_WATCHPOINT");
+  await rightClickScopeNode(dbg, 5);
+  selectContextMenuItem(dbg, selectors.removeWatchpoint);
+  await removedWatchpoint;
+  resume(dbg);
+  await waitForRequestsToSettle(dbg);
+});
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/test/mochitest/browser.ini firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/test/mochitest/browser.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/test/mochitest/browser.ini	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/test/mochitest/browser.ini	2019-09-15 11:33:07.000000000 +0000
@@ -167,3 +167,5 @@
 [browser_dbg-bfcache.js]
 [browser_dbg-gc-breakpoint-positions.js]
 [browser_dbg-gc-sources.js]
+[browser_dbg-watchpoints.js]
+skip-if = debug
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/test/mochitest/examples/doc-watchpoints.html firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/test/mochitest/examples/doc-watchpoints.html
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/test/mochitest/examples/doc-watchpoints.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/test/mochitest/examples/doc-watchpoints.html	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<html>
+
+<script>
+  const obj = { a: { b: 2, c: 3 }, b: 2 };
+  debugger
+  obj.b = 3;
+
+  obj.a.b = 3;
+  obj.a.b = 4;
+
+  console.log(obj.b);
+  obj.b = 4;
+
+  debugger;
+</script>
+
+<body>
+Hello World!
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/test/mochitest/helpers.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/test/mochitest/helpers.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/debugger/test/mochitest/helpers.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/debugger/test/mochitest/helpers.js	2019-09-15 11:33:07.000000000 +0000
@@ -419,7 +419,7 @@
   ok(frames.length >= 1, "Got at least one frame");
   const { sourceId, line } = frames[0].location;
   ok(sourceId == expectedSourceId, "Frame has correct source");
-  ok(line == expectedLine, "Frame has correct line");
+  ok(line == expectedLine, `Frame paused at ${line}, but expected ${expectedLine}`);
 }
 
 // Get any workers associated with the debugger.
@@ -1291,6 +1291,9 @@
   inlinePreviewLables: ".CodeMirror-linewidget .inline-preview-label",
   inlinePreviewValues: ".CodeMirror-linewidget .inline-preview-value",
   inlinePreviewOpenInspector: ".inline-preview-value button.open-inspector",
+  addGetWatchpoint: "#node-menu-add-get-watchpoint",
+  addSetWatchpoint: "#node-menu-add-set-watchpoint",
+  removeWatchpoint: "#node-menu-remove-watchpoint"
 };
 
 function getSelector(elementName, ...args) {
@@ -1391,6 +1394,7 @@
 
 function rightClickEl(dbg, el) {
   const doc = dbg.win.document;
+  el.scrollIntoView();
   EventUtils.synthesizeMouseAtCenter(el, { type: "contextmenu" }, dbg.win);
 }
 
@@ -1443,6 +1447,10 @@
   return toggleObjectInspectorNode(findElement(dbg, "scopeNode", index));
 }
 
+function rightClickScopeNode(dbg, index) {
+  rightClickObjectInspectorNode(dbg, findElement(dbg, "scopeNode", index));
+}
+
 function getScopeLabel(dbg, index) {
   return findElement(dbg, "scopeNode", index).innerText;
 }
@@ -1460,6 +1468,18 @@
   return waitUntil(
     () => objectInspector.querySelectorAll(".node").length !== properties
   );
+}
+
+function rightClickObjectInspectorNode(dbg, node) {
+  const objectInspector = node.closest(".object-inspector");
+  const properties = objectInspector.querySelectorAll(".node").length;
+
+  log(`Right clicking node ${node.innerText}`);
+  rightClickEl(dbg, node);
+
+  return waitUntil(
+    () => objectInspector.querySelectorAll(".node").length !== properties
+  );
 }
 
 function getCM(dbg) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/framework/toolbox.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/framework/toolbox.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/framework/toolbox.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/framework/toolbox.js	2019-09-15 11:33:07.000000000 +0000
@@ -603,6 +603,9 @@
       skipBreakpoints: Services.prefs.getBoolPref(
         "devtools.debugger.skip-pausing"
       ),
+      logEventBreakpoints: Services.prefs.getBoolPref(
+        "devtools.debugger.features.log-event-breakpoints"
+      ),
     });
 
     try {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/locales/en-US/application.ftl firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/locales/en-US/application.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/locales/en-US/application.ftl	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/locales/en-US/application.ftl	2019-09-15 11:33:07.000000000 +0000
@@ -111,6 +111,10 @@
 # Text displayed when the page has no manifest available
 manifest-non-existing = No manifest found to inspect.
 
+# Text displayed when the page has a manifest embedded in a Data URL and
+# thus we cannot link to it.
+manifest-json-link-data-url = The manifest is embedded in a Data URL.
+
 # Sidebar navigation item for Manifest sidebar item section
 sidebar-item-manifest = Manifest
   .alt = Manifest Icon
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/locales/en-US/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/locales/en-US/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/locales/en-US/debugger.properties	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/locales/en-US/debugger.properties	2019-09-15 11:33:07.000000000 +0000
@@ -491,6 +491,10 @@
 # when the debugger will pause on any XHR requests.
 pauseOnAnyXHR=Pause on any URL
 
+# LOCALIZATION NOTE (watchpoints.removeWatchpoint): This is the text that appears in the
+# context menu to delete a watchpoint on an object property.
+watchpoints.removeWatchpoint=Remove watchpoint
+
 # LOCALIZATION NOTE (sourceTabs.closeTab): Editor source tab context menu item
 # for closing the selected tab below the mouse.
 sourceTabs.closeTab=Close tab
@@ -776,6 +780,11 @@
 # promise rejection
 whyPaused.promiseRejection=Paused on promise rejection
 
+# LOCALIZATION NOTE (whyPaused.getWatchpoint): The text that is displayed
+# in a info block explaining how the debugger is currently paused at a
+# watchpoint on an object property
+whyPaused.getWatchpoint=Paused on property access
+
 # LOCALIZATION NOTE (whyPaused.assert): The text that is displayed
 # in a info block explaining how the debugger is currently paused on an
 # assert
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/src/actions/requests.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/src/actions/requests.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/src/actions/requests.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/src/actions/requests.js	2019-09-15 11:33:07.000000000 +0000
@@ -6,6 +6,7 @@
 
 const {
   ADD_REQUEST,
+  BLOCK_SELECTED_REQUEST_DONE,
   CLEAR_REQUESTS,
   CLONE_REQUEST,
   CLONE_SELECTED_REQUEST,
@@ -13,6 +14,7 @@
   RIGHT_CLICK_REQUEST,
   SEND_CUSTOM_REQUEST,
   TOGGLE_RECORDING,
+  UNBLOCK_SELECTED_REQUEST_DONE,
   UPDATE_REQUEST,
 } = require("../constants");
 const { getSelectedRequest, getRequestById } = require("../selectors/index");
@@ -109,13 +111,16 @@
  * Tell the backend to block future requests that match the URL of the selected one.
  */
 function blockSelectedRequestURL(connector, clickedRequest) {
-  return () => {
+  return async dispatch => {
     if (!clickedRequest) {
       return;
     }
 
     const { url } = clickedRequest;
-    connector.blockRequest({ url });
+    await connector.blockRequest({ url });
+    dispatch({
+      type: BLOCK_SELECTED_REQUEST_DONE,
+    });
   };
 }
 
@@ -123,13 +128,16 @@
  * Tell the backend to unblock future requests that match the URL of the selected one.
  */
 function unblockSelectedRequestURL(connector, clickedRequest) {
-  return () => {
+  return async dispatch => {
     if (!clickedRequest) {
       return;
     }
 
     const { url } = clickedRequest;
-    connector.unblockRequest({ url });
+    await connector.unblockRequest({ url });
+    dispatch({
+      type: UNBLOCK_SELECTED_REQUEST_DONE,
+    });
   };
 }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/src/components/StackTracePanel.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/src/components/StackTracePanel.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/src/components/StackTracePanel.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/src/components/StackTracePanel.js	2019-09-15 11:33:07.000000000 +0000
@@ -48,6 +48,10 @@
    */
   componentWillReceiveProps(nextProps) {
     const { request, connector } = nextProps;
+    // If we're not dealing with a new request, bail out.
+    if (this.props.request && this.props.request.actor === request.actor) {
+      return;
+    }
     fetchNetworkUpdatePacket(connector.requestData, request, ["stackTrace"]);
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/src/components/websockets/FrameListContent.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/src/components/websockets/FrameListContent.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/src/components/websockets/FrameListContent.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/src/components/websockets/FrameListContent.js	2019-09-15 11:33:07.000000000 +0000
@@ -136,7 +136,9 @@
     const scrollAnchor = this.refs.scrollAnchor;
 
     if (this.intersectionObserver) {
-      this.intersectionObserver.unobserve(scrollAnchor);
+      if (scrollAnchor) {
+        this.intersectionObserver.unobserve(scrollAnchor);
+      }
       this.initIntersectionObserver = false;
       this.pinnedToBottom = false;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/src/constants.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/src/constants.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/src/constants.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/src/constants.js	2019-09-15 11:33:07.000000000 +0000
@@ -10,6 +10,7 @@
   BATCH_ACTIONS: "BATCH_ACTIONS",
   BATCH_ENABLE: "BATCH_ENABLE",
   BATCH_FLUSH: "BATCH_FLUSH",
+  BLOCK_SELECTED_REQUEST_DONE: "BLOCK_SELECTED_REQUEST_DONE",
   CLEAR_REQUESTS: "CLEAR_REQUESTS",
   CLEAR_TIMING_MARKERS: "CLEAR_TIMING_MARKERS",
   CLONE_REQUEST: "CLONE_REQUEST",
@@ -31,6 +32,7 @@
   TOGGLE_COLUMN: "TOGGLE_COLUMN",
   TOGGLE_RECORDING: "TOGGLE_RECORDING",
   TOGGLE_REQUEST_FILTER_TYPE: "TOGGLE_REQUEST_FILTER_TYPE",
+  UNBLOCK_SELECTED_REQUEST_DONE: "UNBLOCK_SELECTED_REQUEST_DONE",
   UPDATE_REQUEST: "UPDATE_REQUEST",
   WATERFALL_RESIZE: "WATERFALL_RESIZE",
   SET_COLUMNS_WIDTH: "SET_COLUMNS_WIDTH",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/src/create-store.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/src/create-store.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/src/create-store.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/src/create-store.js	2019-09-15 11:33:07.000000000 +0000
@@ -10,6 +10,10 @@
   createStore,
 } = require("devtools/client/shared/vendor/redux");
 
+const {
+  waitUntilService,
+} = require("devtools/client/shared/redux/middleware/wait-service.js");
+
 const { MIN_COLUMN_WIDTH, DEFAULT_COLUMN_WIDTH } = require("./constants");
 
 // Middleware
@@ -62,7 +66,8 @@
     batching,
     recording(connector),
     throttling(connector),
-    eventTelemetry(connector, telemetry)
+    eventTelemetry(connector, telemetry),
+    waitUntilService
   );
 
   return createStore(rootReducer, initialState, middleware);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/browser.ini firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/browser.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/browser.ini	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/browser.ini	2019-09-15 11:33:07.000000000 +0000
@@ -48,6 +48,7 @@
   html_open-request-in-tab.html
   html_worker-test-page.html
   html_websocket-test-page.html
+  html_ws-early-connection-page.html
   html_ws-test-page.html
   js_worker-test.js
   js_worker-test2.js
@@ -61,6 +62,7 @@
   sjs_set-cookie-same-site.sjs
   sjs_simple-test-server.sjs
   sjs_simple-unsorted-cookies-test-server.sjs
+  sjs_slow-script-server.sjs
   sjs_sorting-test-server.sjs
   sjs_status-codes-test-server.sjs
   sjs_truncate-test-server.sjs
@@ -237,6 +239,7 @@
 [browser_net_worker_stacks.js]
 [browser_net_ws-basic.js]
 [browser_net_ws-clear.js]
+[browser_net_ws-early-connection.js]
 [browser_net_ws-filter-dropdown.js]
 [browser_net_ws-limit-payload.js]
 [browser_net_ws-limit-frames.js]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/browser_net_block.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/browser_net_block.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/browser_net_block.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/browser_net_block.js	2019-09-15 11:33:07.000000000 +0000
@@ -43,8 +43,14 @@
       monitor,
       "request-list-context-block-url"
     );
+    const onRequestBlocked = waitForDispatch(
+      store,
+      "BLOCK_SELECTED_REQUEST_DONE"
+    );
     contextBlock.click();
-    info("Set request to blocked");
+    info("Wait for selected request to be blocked");
+    await onRequestBlocked;
+    info("Selected request is now blocked");
   }
 
   // Reload to have one request in the list
@@ -72,8 +78,15 @@
       monitor,
       "request-list-context-unblock-url"
     );
+    const onRequestUnblocked = waitForDispatch(
+      store,
+      "UNBLOCK_SELECTED_REQUEST_DONE"
+    );
     contextUnblock.click();
-    info("Set request to unblocked");
+
+    info("Wait for selected request to be unblocked");
+    await onRequestUnblocked;
+    info("Selected request is now unblocked");
   }
 
   // Reload to have one request in the list
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/browser_net_ws-early-connection.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/browser_net_ws-early-connection.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/browser_net_ws-early-connection.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/browser_net_ws-early-connection.js	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,66 @@
+/* Any copyright is dedicated to the Public Domain.
+   http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * Test that WS connection created while the page is still loading
+ * is properly tracked and there are WS frames displayed in the
+ * Messages side panel.
+ */
+add_task(async function() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["devtools.netmonitor.features.webSockets", true]],
+  });
+
+  const { tab, monitor } = await initNetMonitor(SIMPLE_URL);
+
+  info("Starting test... ");
+
+  const { document, store, windowRequire } = monitor.panelWin;
+  const Actions = windowRequire("devtools/client/netmonitor/src/actions/index");
+
+  store.dispatch(Actions.batchEnable(false));
+
+  // Make the WS Messages side panel the default so, we avoid
+  // request headers from the backend by selecting the Headers
+  // panel
+  store.dispatch(Actions.selectDetailsPanelTab("messages"));
+
+  // Load page that opens WS connection during the load time.
+  const waitForEvents = waitForNetworkEvents(monitor, 3);
+  BrowserTestUtils.loadURI(tab.linkedBrowser, WS_PAGE_EARLY_CONNECTION_URL);
+  await waitForEvents;
+
+  const requests = document.querySelectorAll(
+    ".request-list-item .requests-list-file"
+  );
+  is(requests.length, 3, "There should be three requests");
+
+  // Get index of the WS connection request.
+  const index = Array.from(requests).findIndex(element => {
+    return element.textContent === "file_ws_backend";
+  });
+
+  ok(index !== -1, "There must be one WS connection request");
+
+  // Select the connection request to see WS frames in the side panel.
+  EventUtils.sendMouseEvent({ type: "mousedown" }, requests[index]);
+
+  info("Waiting for WS frames...");
+
+  // Wait for two frames to be displayed in the panel
+  await waitForDOMIfNeeded(
+    document,
+    "#messages-panel .ws-frames-list-table .ws-frame-list-item",
+    4
+  );
+
+  // Check the payload of the first frame.
+  const firstFramePayload = document.querySelector(
+    "#messages-panel .ws-frames-list-table .ws-frame-list-item .ws-frames-list-payload"
+  );
+  is(firstFramePayload.textContent.trim(), "readyState:loading");
+
+  await teardown(monitor);
+});
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/head.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/head.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/head.js	2019-09-15 11:33:07.000000000 +0000
@@ -3,7 +3,7 @@
 
 /* import-globals-from ../../shared/test/shared-head.js */
 /* exported Toolbox, restartNetMonitor, teardown, waitForExplicitFinish,
-   verifyRequestItemTarget, waitFor, testFilterButtons,
+   verifyRequestItemTarget, waitFor, waitForDispatch, testFilterButtons,
    performRequestsInContent, waitForNetworkEvents, selectIndexAndWaitForSourceEditor,
    testColumnsAlignment, hideColumn, showColumn, performRequests, waitForRequestData */
 
@@ -51,6 +51,8 @@
 const WS_BASE_URL =
   "http://mochi.test:8888/browser/devtools/client/netmonitor/test/";
 const WS_PAGE_URL = WS_BASE_URL + "html_ws-test-page.html";
+const WS_PAGE_EARLY_CONNECTION_URL =
+  WS_BASE_URL + "html_ws-early-connection-page.html";
 const API_CALLS_URL = EXAMPLE_URL + "html_api-calls-test-page.html";
 const SIMPLE_URL = EXAMPLE_URL + "html_simple-test-page.html";
 const NAVIGATE_URL = EXAMPLE_URL + "html_navigate-test-page.html";
@@ -745,6 +747,27 @@
 }
 
 /**
+ * Wait for an action of the provided type to be dispatched on the provided
+ * store.
+ *
+ * @param {Object} store
+ *        The redux store (wait-service middleware required).
+ * @param {String} type
+ *        Type of the action to wait for.
+ */
+function waitForDispatch(store, type) {
+  return new Promise(resolve => {
+    store.dispatch({
+      type: "@@service/waitUntil",
+      predicate: action => action.type === type,
+      run: (dispatch, getState, action) => {
+        resolve(action);
+      },
+    });
+  });
+}
+
+/**
  * Tests if a button for a filter of given type is the only one checked.
  *
  * @param string filterType
@@ -1108,3 +1131,20 @@
   const Menu = require("devtools/client/framework/menu");
   return Menu.getMenuElementById(id, monitor.panelWin.document);
 }
+
+/**
+ * Wait for DOM being in specific state. But, do not wait
+ * for change if it's in the expected state already.
+ */
+async function waitForDOMIfNeeded(target, selector, expectedLength = 1) {
+  return new Promise(resolve => {
+    const elements = target.querySelectorAll(selector);
+    if (elements.length == expectedLength) {
+      resolve(elements);
+    } else {
+      waitForDOM(target, selector, expectedLength).then(elems => {
+        resolve(elems);
+      });
+    }
+  });
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/html_ws-early-connection-page.html firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/html_ws-early-connection-page.html
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/html_ws-early-connection-page.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/html_ws-early-connection-page.html	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,24 @@
+<!-- Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/ -->
+<!doctype HTML>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>WebSocket Inspection Test Page</title>
+  </head>
+  <body>
+    <h1>WebSocket Inspection Test Page</h1>
+    <script type="text/javascript">
+      "use strict";
+      const ws = new WebSocket(
+        "ws://mochi.test:8888/browser/devtools/client/netmonitor/test/file_ws_backend");
+
+      ws.onopen = () => {
+        ws.send("readyState:" + document.readyState);
+        ws.close();
+      }
+    </script>
+    <script type="text/javascript"
+      src="http://example.com/browser/devtools/client/netmonitor/test/sjs_slow-script-server.sjs"></script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/sjs_slow-script-server.sjs firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/sjs_slow-script-server.sjs
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/netmonitor/test/sjs_slow-script-server.sjs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/netmonitor/test/sjs_slow-script-server.sjs	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,17 @@
+"use strict";
+
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+
+let timer;
+
+const DELAY_MS = 2000;
+function handleRequest(request, response) {
+  response.processAsync();
+  timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
+  timer.init(() => {
+    response.setHeader("Content-Type", "text/javascript", false);
+    response.write("console.log('script loaded')\n");
+    response.finish();
+  }, DELAY_MS, Ci.nsITimer.TYPE_ONE_SHOT);
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/preferences/debugger.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/preferences/debugger.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/preferences/debugger.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/preferences/debugger.js	2019-09-15 11:33:07.000000000 +0000
@@ -85,3 +85,5 @@
 pref("devtools.debugger.features.overlay-step-buttons", false);
 pref("devtools.debugger.features.overlay-step-buttons", true);
 pref("devtools.debugger.features.inline-preview", true);
+pref("devtools.debugger.features.log-event-breakpoints", false);
+pref("devtools.debugger.features.watchpoints", false);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/responsive/index.css firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/responsive/index.css
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/responsive/index.css	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/responsive/index.css	2019-09-15 11:33:07.000000000 +0000
@@ -121,7 +121,7 @@
     [separator]
     max-content
     [throttling]
-    auto
+    minmax(auto, max-content)
     [separator]
     max-content
     [touch-simulation]
@@ -145,7 +145,7 @@
     [separator]
     max-content
     [throttling]
-    auto
+    minmax(auto, max-content)
     [separator]
     max-content
     [ua]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/components/reps/reps.css firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/components/reps/reps.css
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/components/reps/reps.css	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/components/reps/reps.css	2019-09-15 11:33:07.000000000 +0000
@@ -458,3 +458,31 @@
 .tree-node.focused button.invoke-getter {
   background-color: currentColor;
 }
+
+button.remove-set-watchpoint {
+  mask: url("resource://devtools/client/debugger/images/webconsole-logpoint.svg")
+  no-repeat;
+  display: inline-block;
+  vertical-align: top;
+  height: 15px;
+  width: 15px;
+  margin: 0 4px 0px 20px;
+  padding: 0;
+  border: none;
+  background-color: var(--breakpoint-fill);
+  cursor: pointer;
+}
+
+button.remove-get-watchpoint {
+  mask: url("resource://devtools/client/debugger/images/webconsole-logpoint.svg")
+  no-repeat;
+  display: inline-block;
+  vertical-align: top;
+  height: 15px;
+  width: 15px;
+  margin: 0 4px 0px 20px;
+  padding: 0;
+  border: none;
+  background-color: var(--purple-60);
+  cursor: pointer;
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/components/reps/reps.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/components/reps/reps.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/components/reps/reps.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/components/reps/reps.js	2019-09-15 11:33:07.000000000 +0000
@@ -2321,6 +2321,16 @@
   }
 
   return addToCache(makeNodesForProperties(loadedProps, item));
+} // Builds an expression that resolves to the value of the item in question
+// e.g. `b` in { a: { b: 2 } } resolves to `a.b`
+
+
+function getPathExpression(item) {
+  if (item && item.parent) {
+    return `${getPathExpression(item.parent)}.${item.name}`;
+  }
+
+  return item.name;
 }
 
 function getParent(item) {
@@ -2431,6 +2441,7 @@
   getChildrenWithEvaluations,
   getClosestGripNode,
   getClosestNonBucketNode,
+  getPathExpression,
   getParent,
   getParentGripValue,
   getNonPrototypeParentGripValue,
@@ -2484,12 +2495,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/>. */
-function initialState() {
+function initialState(overrides) {
   return {
     expandedPaths: new Set(),
     loadedProperties: new Map(),
     evaluations: new Map(),
-    actors: new Set()
+    actors: new Set(),
+    watchpoints: new Map(),
+    ...overrides
   };
 }
 
@@ -2517,6 +2530,34 @@
     });
   }
 
+  if (type == "SET_WATCHPOINT") {
+    const {
+      watchpoint,
+      property,
+      path
+    } = data;
+    const obj = state.loadedProperties.get(path);
+    return cloneState({
+      loadedProperties: new Map(state.loadedProperties).set(path, updateObject(obj, property, watchpoint)),
+      watchpoints: new Map(state.watchpoints).set(data.actor, data.watchpoint)
+    });
+  }
+
+  if (type === "REMOVE_WATCHPOINT") {
+    const {
+      path,
+      property,
+      actor
+    } = data;
+    const obj = state.loadedProperties.get(path);
+    const watchpoints = new Map(state.watchpoints);
+    watchpoints.delete(actor);
+    return cloneState({
+      loadedProperties: new Map(state.loadedProperties).set(path, updateObject(obj, property, null)),
+      watchpoints: watchpoints
+    });
+  }
+
   if (type === "NODE_PROPERTIES_LOADED") {
     return cloneState({
       actors: data.actor ? new Set(state.actors || []).add(data.actor) : state.actors,
@@ -2540,12 +2581,24 @@
 
 
   if (type === "RESUME" || type == "NAVIGATE") {
-    return initialState();
+    return initialState({
+      watchpoints: state.watchpoints
+    });
   }
 
   return state;
 }
 
+function updateObject(obj, property, watchpoint) {
+  return { ...obj,
+    ownProperties: { ...obj.ownProperties,
+      [property]: { ...obj.ownProperties[property],
+        watchpoint
+      }
+    }
+  };
+}
+
 function getObjectInspectorState(state) {
   return state.objectInspector;
 }
@@ -2562,6 +2615,10 @@
   return getObjectInspectorState(state).actors;
 }
 
+function getWatchpoints(state) {
+  return getObjectInspectorState(state).watchpoints;
+}
+
 function getLoadedProperties(state) {
   return getObjectInspectorState(state).loadedProperties;
 }
@@ -2576,6 +2633,7 @@
 
 const selectors = {
   getActors,
+  getWatchpoints,
   getEvaluations,
   getExpandedPathKeys,
   getExpandedPaths,
@@ -7395,9 +7453,12 @@
 
 const reducer = __webpack_require__(115);
 
+const actions = __webpack_require__(485);
+
 module.exports = {
   ObjectInspector,
   utils,
+  actions,
   reducer
 };
 
@@ -7521,6 +7582,12 @@
     if (this.roots !== nextProps.roots) {
       this.cachedNodes.clear();
       return;
+    }
+
+    for (const [path, properties] of nextProps.loadedProperties) {
+      if (properties !== this.props.loadedProperties.get(path)) {
+        this.cachedNodes.delete(path);
+      }
     } // If there are new evaluations, we want to remove the existing cached
     // nodes from the cache.
 
@@ -7549,7 +7616,7 @@
     // - OR the focused node changed.
     // - OR the active node changed.
 
-    return loadedProperties.size !== nextProps.loadedProperties.size || evaluations.size !== nextProps.evaluations.size || expandedPaths.size !== nextProps.expandedPaths.size && [...nextProps.expandedPaths].every(path => nextProps.loadedProperties.has(path)) || expandedPaths.size === nextProps.expandedPaths.size && [...nextProps.expandedPaths].some(key => !expandedPaths.has(key)) || this.focusedItem !== nextProps.focusedItem || this.activeItem !== nextProps.activeItem || this.roots !== nextProps.roots;
+    return loadedProperties !== nextProps.loadedProperties || loadedProperties.size !== nextProps.loadedProperties.size || evaluations.size !== nextProps.evaluations.size || expandedPaths.size !== nextProps.expandedPaths.size && [...nextProps.expandedPaths].every(path => nextProps.loadedProperties.has(path)) || expandedPaths.size === nextProps.expandedPaths.size && [...nextProps.expandedPaths].some(key => !expandedPaths.has(key)) || this.focusedItem !== nextProps.focusedItem || this.activeItem !== nextProps.activeItem || this.roots !== nextProps.roots;
   }
 
   componentWillUnmount() {
@@ -7747,8 +7814,14 @@
 } = __webpack_require__(196);
 
 const {
+  getPathExpression,
+  getValue
+} = __webpack_require__(114);
+
+const {
   getLoadedProperties,
-  getActors
+  getActors,
+  getWatchpoints
 } = __webpack_require__(115);
 
 /**
@@ -7817,6 +7890,67 @@
     }
   };
 }
+/*
+ * This action adds a property watchpoint to an object
+ */
+
+
+function addWatchpoint(item, watchpoint) {
+  return async function ({
+    dispatch,
+    client
+  }) {
+    const {
+      parent,
+      name
+    } = item;
+    const object = getValue(parent);
+
+    if (!object) {
+      return;
+    }
+
+    const path = parent.path;
+    const property = name;
+    const label = getPathExpression(item);
+    const actor = object.actor;
+    await client.addWatchpoint(object, property, label, watchpoint);
+    dispatch({
+      type: "SET_WATCHPOINT",
+      data: {
+        path,
+        watchpoint,
+        property,
+        actor
+      }
+    });
+  };
+}
+/*
+ * This action removes a property watchpoint from an object
+ */
+
+
+function removeWatchpoint(item) {
+  return async function ({
+    dispatch,
+    client
+  }) {
+    const object = getValue(item.parent);
+    const property = item.name;
+    const path = item.parent.path;
+    const actor = object.actor;
+    await client.removeWatchpoint(object, property);
+    dispatch({
+      type: "REMOVE_WATCHPOINT",
+      data: {
+        path,
+        property,
+        actor
+      }
+    });
+  };
+}
 
 function closeObjectInspector() {
   return async ({
@@ -7852,9 +7986,14 @@
 
 function releaseActors(state, client) {
   const actors = getActors(state);
+  const watchpoints = getWatchpoints(state);
 
   for (const actor of actors) {
-    client.releaseActor(actor);
+    // Watchpoints are stored in object actors.
+    // If we release the actor we lose the watchpoint.
+    if (!watchpoints.has(actor)) {
+      client.releaseActor(actor);
+    }
   }
 }
 
@@ -7887,7 +8026,9 @@
   nodeCollapse,
   nodeLoadProperties,
   nodePropertiesLoaded,
-  rootsChanged
+  rootsChanged,
+  addWatchpoint,
+  removeWatchpoint
 };
 
 /***/ }),
@@ -7957,7 +8098,13 @@
 } = Utils.node;
 
 class ObjectInspectorItem extends Component {
-  // eslint-disable-next-line complexity
+  static get defaultProps() {
+    return {
+      onContextMenu: () => {}
+    };
+  } // eslint-disable-next-line complexity
+
+
   getLabelAndValue() {
     const {
       item,
@@ -8072,7 +8219,8 @@
       expanded,
       onCmdCtrlClick,
       onDoubleClick,
-      dimTopLevelWindow
+      dimTopLevelWindow,
+      onContextMenu
     } = this.props;
     const parentElementProps = {
       className: classnames("node object-node", {
@@ -8101,7 +8249,8 @@
         if (Utils.selection.documentHasSelection() && !(e.target && e.target.matches && e.target.matches(".arrow"))) {
           e.stopPropagation();
         }
-      }
+      },
+      onContextMenu: e => onContextMenu(e, item)
     };
 
     if (onDoubleClick) {
@@ -8149,6 +8298,24 @@
     }, label);
   }
 
+  renderWatchpointButton() {
+    const {
+      item,
+      removeWatchpoint
+    } = this.props;
+
+    if (!item || !item.contents || !item.contents.watchpoint) {
+      return;
+    }
+
+    const watchpoint = item.contents.watchpoint;
+    return dom.button({
+      className: `remove-${watchpoint}-watchpoint`,
+      title: L10N.getStr("watchpoints.removeWatchpoint"),
+      onClick: () => removeWatchpoint(item)
+    });
+  }
+
   render() {
     const {
       arrow
@@ -8161,7 +8328,7 @@
     const delimiter = value && labelElement ? dom.span({
       className: "object-delimiter"
     }, ": ") : null;
-    return dom.div(this.getTreeItemProps(), arrow, labelElement, delimiter, value);
+    return dom.div(this.getTreeItemProps(), arrow, labelElement, delimiter, value, this.renderWatchpointButton());
   }
 
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/test/browser_html_tooltip_doorhanger-02.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/test/browser_html_tooltip_doorhanger-02.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/test/browser_html_tooltip_doorhanger-02.js	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/test/browser_html_tooltip_doorhanger-02.js	2019-09-15 11:33:07.000000000 +0000
@@ -64,7 +64,7 @@
       `anchor: ${describeBounds(anchorBounds)}, ` +
       `arrow: ${describeBounds(arrowBounds)}`;
     ok(
-      delta < 1,
+      delta <= 1,
       `Arrow center is roughly aligned with anchor center (${params})`
     );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/test/browser_html_tooltip_offset.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/test/browser_html_tooltip_offset.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/test/browser_html_tooltip_offset.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/test/browser_html_tooltip_offset.js	2019-09-15 11:33:07.000000000 +0000
@@ -37,6 +37,8 @@
   tooltip.panel.appendChild(div);
   tooltip.setContentSize({ width: 50, height: 100 });
 
+  const { offsetTop, offsetLeft } = getOffsets(doc);
+
   info("Display the tooltip on box1.");
   await showTooltip(tooltip, box1, { x: 5, y: 10 });
 
@@ -44,8 +46,16 @@
   let anchorRect = box1.getBoundingClientRect();
 
   // Tooltip will be displayed below box1
-  is(panelRect.top, anchorRect.bottom + 10, "Tooltip top has 10px offset");
-  is(panelRect.left, anchorRect.left + 5, "Tooltip left has 5px offset");
+  is(
+    panelRect.top,
+    anchorRect.bottom + 10 + offsetTop,
+    "Tooltip top has 10px offset"
+  );
+  is(
+    panelRect.left,
+    anchorRect.left + 5 + offsetLeft,
+    "Tooltip left has 5px offset"
+  );
   is(panelRect.height, 100, "Tooltip height is at 100px as expected");
 
   info("Display the tooltip on box2.");
@@ -56,8 +66,16 @@
 
   // Tooltip will be displayed below box2, but can't be fully displayed because of the
   // offset
-  is(panelRect.top, anchorRect.bottom + 10, "Tooltip top has 10px offset");
-  is(panelRect.left, anchorRect.left + 5, "Tooltip left has 5px offset");
+  is(
+    panelRect.top,
+    anchorRect.bottom + 10 + offsetTop,
+    "Tooltip top has 10px offset"
+  );
+  is(
+    panelRect.left,
+    anchorRect.left + 5 + offsetLeft,
+    "Tooltip left has 5px offset"
+  );
   is(panelRect.height, 90, "Tooltip height is only 90px");
 
   info("Display the tooltip on box3.");
@@ -70,10 +88,14 @@
   // offset
   is(
     panelRect.bottom,
-    anchorRect.top - 10,
+    anchorRect.top - 10 + offsetTop,
     "Tooltip bottom is 10px above anchor"
   );
-  is(panelRect.left, anchorRect.left + 5, "Tooltip left has 5px offset");
+  is(
+    panelRect.left,
+    anchorRect.left + 5 + offsetLeft,
+    "Tooltip left has 5px offset"
+  );
   is(panelRect.height, 90, "Tooltip height is only 90px");
 
   info("Display the tooltip on box4.");
@@ -85,10 +107,14 @@
   // Tooltip will be displayed above box4
   is(
     panelRect.bottom,
-    anchorRect.top - 10,
+    anchorRect.top - 10 + offsetTop,
     "Tooltip bottom is 10px above anchor"
   );
-  is(panelRect.left, anchorRect.left + 5, "Tooltip left has 5px offset");
+  is(
+    panelRect.left,
+    anchorRect.left + 5 + offsetLeft,
+    "Tooltip left has 5px offset"
+  );
   is(panelRect.height, 100, "Tooltip height is at 100px as expected");
 
   await hideTooltip(tooltip);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/test/browser_html_tooltip_rtl.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/test/browser_html_tooltip_rtl.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/test/browser_html_tooltip_rtl.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/test/browser_html_tooltip_rtl.js	2019-09-15 11:33:07.000000000 +0000
@@ -63,6 +63,8 @@
   const box1 = doc.getElementById("box1");
   const box2 = doc.getElementById("box2");
 
+  const { offsetTop, offsetLeft } = getOffsets(tooltip.doc);
+
   info("Display the tooltip on box1.");
   await showTooltip(tooltip, box1, { position: "bottom" });
 
@@ -71,10 +73,14 @@
 
   // box1 uses RTL direction, so the tooltip should be aligned with the right edge of the
   // anchor, but it is shifted to the right to fit in the toolbox.
-  is(panelRect.left, 0, "Tooltip is aligned with left edge of the toolbox");
+  is(
+    panelRect.left,
+    0 + offsetLeft,
+    "Tooltip is aligned with left edge of the toolbox"
+  );
   is(
     panelRect.top,
-    anchorRect.bottom,
+    anchorRect.bottom + offsetTop,
     "Tooltip aligned with the anchor bottom edge"
   );
   is(
@@ -92,12 +98,12 @@
   // box2 uses RTL direction, so the tooltip is aligned with the right edge of the anchor
   is(
     panelRect.right,
-    anchorRect.right,
+    anchorRect.right + offsetLeft,
     "Tooltip is aligned with right edge of anchor"
   );
   is(
     panelRect.top,
-    anchorRect.bottom,
+    anchorRect.bottom + offsetTop,
     "Tooltip aligned with the anchor bottom edge"
   );
   is(
@@ -126,6 +132,8 @@
   const box3 = doc.getElementById("box3");
   const box4 = doc.getElementById("box4");
 
+  const { offsetTop, offsetLeft } = getOffsets(tooltip.doc);
+
   info("Display the tooltip on box3.");
   await showTooltip(tooltip, box3, { position: "bottom" });
 
@@ -135,12 +143,12 @@
   // box3 uses LTR direction, so the tooltip is aligned with the left edge of the anchor.
   is(
     panelRect.left,
-    anchorRect.left,
+    anchorRect.left + offsetLeft,
     "Tooltip is aligned with left edge of anchor"
   );
   is(
     panelRect.top,
-    anchorRect.bottom,
+    anchorRect.bottom + offsetTop,
     "Tooltip aligned with the anchor bottom edge"
   );
   is(
@@ -159,12 +167,12 @@
   // anchor, but it is shifted to the left to fit in the toolbox.
   is(
     panelRect.right,
-    TOOLBOX_WIDTH,
+    TOOLBOX_WIDTH + offsetLeft,
     "Tooltip is aligned with right edge of toolbox"
   );
   is(
     panelRect.top,
-    anchorRect.bottom,
+    anchorRect.bottom + offsetTop,
     "Tooltip aligned with the anchor bottom edge"
   );
   is(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/test/head.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/test/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/test/head.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/test/head.js	2019-09-15 11:33:07.000000000 +0000
@@ -227,3 +227,30 @@
 
   await onRender;
 };
+
+/**
+ * Our calculations are slightly off so we add offsets for hidpi and non-hidpi
+ * screens.
+ *
+ * @param {Document} doc
+ *        The document that owns the tooltip.
+ */
+function getOffsets(doc) {
+  let offsetTop = 0;
+  let offsetLeft = 0;
+
+  if (doc && doc.defaultView.devicePixelRatio === 2) {
+    // On hidpi screens our calculations are off by 2 vertical pixels.
+    offsetTop = 2;
+  } else {
+    // On non-hidpi screens our calculations are off by 1 vertical pixel.
+    offsetTop = 1;
+  }
+
+  if (doc && doc.defaultView.devicePixelRatio !== 2) {
+    // On hidpi screens our calculations are off by 1 horizontal pixel.
+    offsetLeft = 1;
+  }
+
+  return { offsetTop, offsetLeft };
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/test/helper_html_tooltip.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/test/helper_html_tooltip.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/test/helper_html_tooltip.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/test/helper_html_tooltip.js	2019-09-15 11:33:08.000000000 +0000
@@ -1,6 +1,7 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 /* eslint no-unused-vars: [2, {"vars": "local", "args": "none"}] */
+/* import-globals-from head.js */
 
 "use strict";
 
@@ -80,11 +81,20 @@
   info("Check the tooltip geometry matches expected position and dimensions");
   const tooltipRect = tooltip.container.getBoundingClientRect();
   const anchorRect = anchor.getBoundingClientRect();
+  const { offsetTop, offsetLeft } = getOffsets(tooltip.doc);
 
   if (position === "top") {
-    is(tooltipRect.bottom, anchorRect.top, "Tooltip is above the anchor");
+    is(
+      tooltipRect.bottom,
+      anchorRect.top + offsetTop,
+      "Tooltip is above the anchor"
+    );
   } else if (position === "bottom") {
-    is(tooltipRect.top, anchorRect.bottom, "Tooltip is below the anchor");
+    is(
+      tooltipRect.top,
+      anchorRect.bottom + offsetTop,
+      "Tooltip is below the anchor"
+    );
   } else {
     ok(false, "Invalid position provided to checkTooltipGeometry");
   }
@@ -92,7 +102,7 @@
   if (leftAligned) {
     is(
       tooltipRect.left,
-      anchorRect.left,
+      anchorRect.left + offsetLeft,
       "Tooltip left-aligned with the anchor"
     );
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/widgets/tooltip/HTMLTooltip.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/widgets/tooltip/HTMLTooltip.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/shared/widgets/tooltip/HTMLTooltip.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/shared/widgets/tooltip/HTMLTooltip.js	2019-09-15 11:33:08.000000000 +0000
@@ -98,6 +98,8 @@
  *        Preferred position for the tooltip. Possible values: "top" or "bottom".
  * @param {Number} offset
  *        Offset between the top of the anchor and the tooltip.
+ * @param {Document} [doc]
+ *        The current document (optional).
  * @return {Object}
  *         - {Number} top: the top offset for the tooltip.
  *         - {Number} height: the height to use for the tooltip container.
@@ -109,7 +111,8 @@
   viewportRect,
   height,
   pos,
-  offset
+  offset,
+  doc = null
 ) => {
   const { TOP, BOTTOM } = POSITION;
 
@@ -147,6 +150,14 @@
   // Translate back to absolute coordinates by re-including viewport top margin.
   top += viewportRect.top;
 
+  if (doc && doc.defaultView.devicePixelRatio === 2) {
+    // On hidpi screens our calculations are off by 2 vertical pixels.
+    top += 2;
+  } else {
+    // On non-hidpi screens our calculations are off by 1 vertical pixel.
+    top += 1;
+  }
+
   return { top, height, computedPosition: pos };
 };
 
@@ -177,6 +188,8 @@
  *        platform.
  * @param {Boolean} isRtl
  *        If the anchor is in RTL, the tooltip should be aligned to the right.
+ * @param {Document} [doc]
+ *        The current document (optional).
  * @return {Object}
  *         - {Number} left: the left offset for the tooltip.
  *         - {Number} width: the width to use for the tooltip container.
@@ -190,7 +203,8 @@
   type,
   offset,
   borderRadius,
-  isRtl
+  isRtl,
+  doc = null
 ) => {
   // Which direction should the tooltip go?
   //
@@ -260,7 +274,7 @@
   }
 
   // Convert from logical coordinates to physical
-  const left =
+  let left =
     hangDirection === "right"
       ? viewportRect.left + tooltipStart
       : viewportRect.right - tooltipStart - tooltipWidth;
@@ -269,6 +283,11 @@
       ? arrowStart
       : tooltipWidth - arrowWidth - arrowStart;
 
+  if (doc && doc.defaultView.devicePixelRatio !== 2) {
+    // On hidpi screens our calculations are off by 1 horizontal pixel.
+    left += 1;
+  }
+
   return { left, width: tooltipWidth, arrowLeft };
 };
 
@@ -566,7 +585,8 @@
       this.type,
       x,
       borderRadius,
-      isRtl
+      isRtl,
+      this.doc
     );
 
     // If we constrained the width, then any measured height we have is no
@@ -615,7 +635,8 @@
       viewportRect,
       preferredHeight,
       position,
-      y
+      y,
+      this.doc
     );
 
     this._position = computedPosition;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/webconsole/test/browser/browser_console_open_or_focus.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/webconsole/test/browser/browser_console_open_or_focus.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/webconsole/test/browser/browser_console_open_or_focus.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/webconsole/test/browser/browser_console_open_or_focus.js	2019-09-15 11:33:08.000000000 +0000
@@ -5,32 +5,37 @@
 // the console window instead of toggling it open/close.
 
 "use strict";
+requestLongerTimeout(2);
 
 const TEST_MESSAGE = "testmessage";
 const { Tools } = require("devtools/client/definitions");
 
 add_task(async function() {
-  let currWindow, hud;
-
+  info("Get main browser window");
   const mainWindow = Services.wm.getMostRecentWindow(null);
 
+  info("Open the Browser Console");
   await BrowserConsoleManager.openBrowserConsoleOrFocus();
 
-  hud = BrowserConsoleManager.getBrowserConsole();
-
-  ok(hud.ui.document.hasFocus(), "Focus in the document");
+  let hud = BrowserConsoleManager.getBrowserConsole();
+  await waitFor(() => hud.ui.document.hasFocus());
+  ok(true, "Focus is in the Browser Console");
 
+  info("Emit a log message to display it in the Browser Console");
   console.log(TEST_MESSAGE);
-
   await waitFor(() => findMessage(hud, TEST_MESSAGE));
 
-  currWindow = Services.wm.getMostRecentWindow(null);
+  let currWindow = Services.wm.getMostRecentWindow(null);
   is(
     currWindow.document.documentURI,
     Tools.webConsole.url,
     "The Browser Console is open and has focus"
   );
+
+  info("Focus the main browser window");
   mainWindow.focus();
+
+  info("Focus the Browser Console window");
   await BrowserConsoleManager.openBrowserConsoleOrFocus();
   currWindow = Services.wm.getMostRecentWindow(null);
   is(
@@ -38,6 +43,8 @@
     Tools.webConsole.url,
     "The Browser Console is open and has focus"
   );
+
+  info("Close the Browser Console");
   await BrowserConsoleManager.toggleBrowserConsole();
   hud = BrowserConsoleManager.getBrowserConsole();
   ok(!hud, "Browser Console has been closed");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/webconsole/test/browser/browser.ini firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/webconsole/test/browser/browser.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/webconsole/test/browser/browser.ini	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/webconsole/test/browser/browser.ini	2019-09-15 11:33:07.000000000 +0000
@@ -177,9 +177,6 @@
 [browser_console_jsterm_await.js]
 [browser_console_nsiconsolemessage.js]
 [browser_console_open_or_focus.js]
-skip-if =
-  (verify && debug && (os == 'mac' || os == 'linux')) ||
-  (fission && debug) # Fails intermittently.
 [browser_console_restore.js]
 skip-if = verify
 [browser_console_webconsole_console_api_calls.js]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/webreplay/mochitest/head.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/webreplay/mochitest/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/client/webreplay/mochitest/head.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/client/webreplay/mochitest/head.js	2019-09-15 11:33:07.000000000 +0000
@@ -193,6 +193,7 @@
   "resource://testing-common/PromiseTestUtils.jsm"
 );
 PromiseTestUtils.whitelistRejectionsGlobally(/NS_ERROR_NOT_INITIALIZED/);
+PromiseTestUtils.whitelistRejectionsGlobally(/Error in asyncStorage/);
 
 // Many web replay tests can resume execution before the debugger has finished
 // all operations related to the pause.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/breakpoint.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/breakpoint.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/breakpoint.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/breakpoint.js	2019-09-15 11:33:07.000000000 +0000
@@ -6,7 +6,10 @@
 
 "use strict";
 
-const { formatDisplayName } = require("devtools/server/actors/frame");
+const {
+  logEvent,
+  getThrownMessage,
+} = require("devtools/server/actors/utils/logEvent");
 
 /**
  * Set breakpoints on all the given entry points with the given
@@ -127,20 +130,6 @@
     }
   },
 
-  // Get a string message to display when a frame evaluation throws.
-  getThrownMessage(completion) {
-    try {
-      if (completion.throw.getOwnPropertyDescriptor) {
-        return completion.throw.getOwnPropertyDescriptor("message").value;
-      } else if (completion.toString) {
-        return completion.toString();
-      }
-    } catch (ex) {
-      // ignore
-    }
-    return "Unknown exception";
-  },
-
   /**
    * Check if this breakpoint has a condition that doesn't error and
    * evaluates to true in frame.
@@ -162,7 +151,7 @@
         // The evaluation failed and threw
         return {
           result: true,
-          message: this.getThrownMessage(completion),
+          message: getThrownMessage(completion),
         };
       } else if (completion.yield) {
         assert(false, "Shouldn't ever get yield completions from an eval");
@@ -232,38 +221,12 @@
     }
 
     if (logValue) {
-      const displayName = formatDisplayName(frame);
-      const completion = frame.evalWithBindings(`[${logValue}]`, {
-        displayName,
+      return logEvent({
+        threadActor: this.threadActor,
+        frame,
+        level: "logPoint",
+        expression: `[${logValue}]`,
       });
-      let value;
-      let level = "logPoint";
-
-      if (!completion) {
-        // The evaluation was killed (possibly by the slow script dialog).
-        value = ["Log value evaluation incomplete"];
-      } else if ("return" in completion) {
-        value = completion.return;
-      } else {
-        value = [this.getThrownMessage(completion)];
-        level = "logPointError";
-      }
-
-      if (value && typeof value.unsafeDereference === "function") {
-        value = value.unsafeDereference();
-      }
-
-      const message = {
-        filename: sourceActor.url,
-        lineNumber: line,
-        columnNumber: column,
-        arguments: value,
-        level,
-      };
-      this.threadActor._parent._consoleActor.onConsoleAPICall(message);
-
-      // Never stop at log points.
-      return undefined;
     }
 
     return this.threadActor._pauseAndRespond(frame, reason);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/network-monitor/network-monitor.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/network-monitor/network-monitor.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/network-monitor/network-monitor.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/network-monitor/network-monitor.js	2019-09-15 11:33:07.000000000 +0000
@@ -229,11 +229,13 @@
   onBlockRequest({ data }) {
     const { filter } = data;
     this.observer.blockRequest(filter);
+    this.messageManager.sendAsyncMessage("debug:block-request:response");
   },
 
   onUnblockRequest({ data }) {
     const { filter } = data;
     this.observer.unblockRequest(filter);
+    this.messageManager.sendAsyncMessage("debug:unblock-request:response");
   },
 
   onGetNetworkEventActor({ data }) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/network-monitor/websocket-actor.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/network-monitor/websocket-actor.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/network-monitor/websocket-actor.js	2019-09-13 05:13:11.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/network-monitor/websocket-actor.js	2019-09-15 11:33:07.000000000 +0000
@@ -29,23 +29,18 @@
     this.connections = new Map();
 
     // Register for backend events.
-    this.onNavigate = this.onNavigate.bind(this);
-    this.onWillNavigate = this.onWillNavigate.bind(this);
-    this.targetActor.on("navigate", this.onNavigate);
-    this.targetActor.on("will-navigate", this.onWillNavigate);
+    this.onWindowReady = this.onWindowReady.bind(this);
+    this.targetActor.on("window-ready", this.onWindowReady);
   },
 
-  onWillNavigate: function() {
-    this.stopListening();
-  },
-
-  onNavigate: function() {
-    this.startListening();
+  onWindowReady({ isTopLevel }) {
+    if (isTopLevel) {
+      this.startListening();
+    }
   },
 
   destroy: function() {
-    this.targetActor.off("navigate", this.onNavigate);
-    this.targetActor.off("will-navigate", this.onWillNavigate);
+    this.targetActor.off("window-ready", this.onWindowReady);
 
     this.stopListening();
     Actor.prototype.destroy.call(this);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/object.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/object.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/object.js	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/object.js	2019-09-15 11:33:08.000000000 +0000
@@ -123,10 +123,10 @@
 
     this._originalDescriptors.set(property, { desc, watchpointType });
 
-    const pauseAndRespond = () => {
+    const pauseAndRespond = type => {
       const frame = this.thread.dbg.getNewestFrame();
       this.thread._pauseAndRespond(frame, {
-        type: "watchpoint",
+        type: type,
         message: label,
       });
     };
@@ -139,7 +139,7 @@
           desc.value = v;
         }),
         get: this.obj.makeDebuggeeValue(() => {
-          pauseAndRespond();
+          pauseAndRespond("getWatchpoint");
           return desc.value;
         }),
       });
@@ -150,7 +150,7 @@
         configurable: desc.configurable,
         enumerable: desc.enumerable,
         set: this.obj.makeDebuggeeValue(v => {
-          pauseAndRespond();
+          pauseAndRespond("setWatchpoint");
           desc.value = v;
         }),
         get: this.obj.makeDebuggeeValue(v => {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/root.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/root.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/root.js	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/root.js	2019-09-15 11:33:07.000000000 +0000
@@ -180,6 +180,8 @@
     // Supports native log points and modifying the condition/log of an existing
     // breakpoints. Fx66+
     nativeLogpoints: true,
+    // Supports watchpoints in the server for Fx71+
+    watchpoints: true,
     // support older browsers for Fx69+
     hasThreadFront: true,
   },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/thread.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/thread.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/thread.js	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/thread.js	2019-09-15 11:33:07.000000000 +0000
@@ -19,6 +19,8 @@
   makeEventBreakpointMessage,
 } = require("devtools/server/actors/utils/event-breakpoints");
 
+const { logEvent } = require("devtools/server/actors/utils/logEvent");
+
 loader.lazyRequireGetter(
   this,
   "EnvironmentActor",
@@ -715,6 +717,16 @@
       return undefined;
     }
 
+    if (this._options.logEventBreakpoints) {
+      return logEvent({
+        threadActor: this,
+        frame,
+        level: "logPoint",
+        expression: `[_event]`,
+        bindings: { _event: frame.arguments[0] },
+      });
+    }
+
     return this._pauseAndRespond(frame, {
       type: "eventBreakpoint",
       breakpoint: eventBreakpoint,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/utils/inactive-property-helper.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/utils/inactive-property-helper.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/utils/inactive-property-helper.js	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/utils/inactive-property-helper.js	2019-09-15 11:33:07.000000000 +0000
@@ -27,10 +27,8 @@
    * This file contains "rules" in the form of objects with the following
    * properties:
    * {
-   *   invalidProperties (see note):
+   *   invalidProperties:
    *     Array of CSS property names that are inactive if the rule matches.
-   *   validProperties (see note):
-   *     Array of CSS property names that are active if the rule matches.
    *   when:
    *     The rule itself, a JS function used to identify the conditions
    *     indicating whether a property is valid or not.
@@ -44,8 +42,6 @@
    *     The number of properties we suggest in the fixId string.
    * }
    *
-   * NOTE: validProperties and invalidProperties are mutually exclusive.
-   *
    * If you add a new rule, also add a test for it in:
    * server/tests/mochitest/test_inspector-inactive-property-helper.html
    *
@@ -244,8 +240,6 @@
         isRuleConcerned =
           validator.invalidProperties === "*" ||
           validator.invalidProperties.includes(property);
-      } else if (validator.validProperties) {
-        isRuleConcerned = !validator.validProperties.includes(property);
       }
 
       if (!isRuleConcerned) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/utils/logEvent.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/utils/logEvent.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/utils/logEvent.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/utils/logEvent.js	2019-09-15 11:33:07.000000000 +0000
@@ -0,0 +1,60 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+"use strict";
+
+const { formatDisplayName } = require("devtools/server/actors/frame");
+
+// Get a string message to display when a frame evaluation throws.
+function getThrownMessage(completion) {
+  try {
+    if (completion.throw.getOwnPropertyDescriptor) {
+      return completion.throw.getOwnPropertyDescriptor("message").value;
+    } else if (completion.toString) {
+      return completion.toString();
+    }
+  } catch (ex) {
+    // ignore
+  }
+  return "Unknown exception";
+}
+module.exports.getThrownMessage = getThrownMessage;
+
+function logEvent({ threadActor, frame, level, expression, bindings }) {
+  const { sourceActor, line, column } = threadActor.sources.getFrameLocation(
+    frame
+  );
+  const displayName = formatDisplayName(frame);
+  const completion = frame.evalWithBindings(expression, {
+    displayName,
+    ...bindings,
+  });
+
+  let value;
+  if (!completion) {
+    // The evaluation was killed (possibly by the slow script dialog).
+    value = ["Evaluation failed"];
+  } else if ("return" in completion) {
+    value = completion.return;
+  } else {
+    value = [getThrownMessage(completion)];
+    level = `${level}Error`;
+  }
+
+  if (value && typeof value.unsafeDereference === "function") {
+    value = value.unsafeDereference();
+  }
+
+  const message = {
+    filename: sourceActor.url,
+    lineNumber: line,
+    columnNumber: column,
+    arguments: value,
+    level,
+  };
+
+  threadActor._parent._consoleActor.onConsoleAPICall(message);
+}
+
+module.exports.logEvent = logEvent;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/utils/moz.build firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/utils/moz.build
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/utils/moz.build	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/utils/moz.build	2019-09-15 11:33:07.000000000 +0000
@@ -14,6 +14,7 @@
     'event-breakpoints.js',
     'event-loop.js',
     'inactive-property-helper.js',
+    'logEvent.js',
     'make-debugger.js',
     'shapes-utils.js',
     'stack.js',
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/webconsole.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/webconsole.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/actors/webconsole.js	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/actors/webconsole.js	2019-09-15 11:33:07.000000000 +0000
@@ -1912,6 +1912,39 @@
   },
 
   /**
+   * Send a message to all the netmonitor message managers, and resolve when
+   * all of them replied with the expected responseName message.
+   *
+   * @param {String} messageName
+   *        Name of the message to send via the netmonitor message managers.
+   * @param {String} responseName
+   *        Name of the message that should be received when the message has
+   *        been processed by the netmonitor instance.
+   * @param {Object} args
+   *        argument object passed with the initial message.
+   */
+  async _sendMessageToNetmonitors(messageName, responseName, args) {
+    if (!this.netmonitors) {
+      return;
+    }
+    await Promise.all(
+      this.netmonitors.map(({ messageManager }) => {
+        const onResponseReceived = new Promise(resolve => {
+          messageManager.addMessageListener(
+            responseName,
+            function onResponse() {
+              messageManager.removeMessageListener(responseName, onResponse);
+              resolve();
+            }
+          );
+        });
+        messageManager.sendAsyncMessage(messageName, args);
+        return onResponseReceived;
+      })
+    );
+  },
+
+  /**
    * Block a request based on certain filtering options.
    *
    * Currently, an exact URL match is the only supported filter type.
@@ -1922,13 +1955,11 @@
    *   An object containing a `url` key with a URL to block.
    */
   async blockRequest(filter) {
-    if (this.netmonitors) {
-      for (const { messageManager } of this.netmonitors) {
-        messageManager.sendAsyncMessage("debug:block-request", {
-          filter,
-        });
-      }
-    }
+    await this._sendMessageToNetmonitors(
+      "debug:block-request",
+      "debug:block-request:response",
+      { filter }
+    );
 
     return {};
   },
@@ -1944,13 +1975,11 @@
    *   An object containing a `url` key with a URL to unblock.
    */
   async unblockRequest(filter) {
-    if (this.netmonitors) {
-      for (const { messageManager } of this.netmonitors) {
-        messageManager.sendAsyncMessage("debug:unblock-request", {
-          filter,
-        });
-      }
-    }
+    await this._sendMessageToNetmonitors(
+      "debug:unblock-request",
+      "debug:unblock-request:response",
+      { filter }
+    );
 
     return {};
   },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/tests/unit/test_watchpoint-01.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/tests/unit/test_watchpoint-01.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/server/tests/unit/test_watchpoint-01.js	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/server/tests/unit/test_watchpoint-01.js	2019-09-15 11:33:08.000000000 +0000
@@ -51,7 +51,7 @@
   //Test that watchpoint triggers pause on set.
   const packet2 = await resumeAndWaitForPause(threadFront);
   Assert.equal(packet2.frame.where.line, 4);
-  Assert.equal(packet2.why.type, "watchpoint");
+  Assert.equal(packet2.why.type, "setWatchpoint");
   Assert.equal(obj.preview.ownProperties.a.value, 1);
   
   await resume(threadFront);
@@ -91,7 +91,7 @@
   //Test that watchpoint triggers pause on get.
   const packet2 = await resumeAndWaitForPause(threadFront);
   Assert.equal(packet2.frame.where.line, 4);
-  Assert.equal(packet2.why.type, "watchpoint");
+  Assert.equal(packet2.why.type, "getWatchpoint");
   Assert.equal(obj.preview.ownProperties.a.value, 1);
   
   await resume(threadFront);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/devtools/shared/webconsole/test/unit/test_js_property_provider.js firefox-trunk-71.0~a1~hg20190915r493291/devtools/shared/webconsole/test/unit/test_js_property_provider.js
--- firefox-trunk-71.0~a1~hg20190913r492975/devtools/shared/webconsole/test/unit/test_js_property_provider.js	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/devtools/shared/webconsole/test/unit/test_js_property_provider.js	2019-09-15 11:33:07.000000000 +0000
@@ -132,6 +132,33 @@
     test_has_no_results(results);
   }
 
+  info("Test that suggestions are given for 'globalThis'");
+  results = propertyProvider("g");
+  test_has_result(results, "globalThis");
+
+  info("Test that suggestions are given for 'globalThis.'");
+  results = propertyProvider("globalThis.");
+  test_has_result(results, "testObject");
+
+  info("Test that suggestions are given for '(globalThis).'");
+  results = propertyProvider("(globalThis).");
+  test_has_result(results, "testObject");
+
+  info(
+    "Test that suggestions are given for deep 'globalThis' properties access"
+  );
+  results = propertyProvider("(globalThis).testObject.propA.");
+  test_has_result(results, "shift");
+
+  results = propertyProvider("(globalThis).testObject.propA[");
+  test_has_result(results, `"shift"`);
+
+  results = propertyProvider("(globalThis)['testObject']['propA'][");
+  test_has_result(results, `"shift"`);
+
+  results = propertyProvider("(globalThis).testObject['propA'].");
+  test_has_result(results, "shift");
+
   info("Testing lexical scope issues (Bug 1207868)");
   results = propertyProvider("foobar");
   test_has_result(results, "foobar");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/base/crashtests/crashtests.list firefox-trunk-71.0~a1~hg20190915r493291/dom/base/crashtests/crashtests.list
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/base/crashtests/crashtests.list	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/base/crashtests/crashtests.list	2019-09-15 11:33:08.000000000 +0000
@@ -230,7 +230,7 @@
 load 1411473.html
 load 1413815.html
 load 1419799.html
-skip-if(!browserIsRemote) skip-if(geckoview&&webrender) skip-if(geckoview&&isDebugBuild) pref(dom.disable_open_during_load,false) load 1419902.html # skip on non e10s loads, Bug 1419902. Bug 1563013 for GV+WR. Bug 1524493 GV+debug.
+skip-if(!browserIsRemote) skip-if(geckoview&&webrender) skip-if(geckoview&&isDebugBuild) skip-if(AddressSanitizer) pref(dom.disable_open_during_load,false) load 1419902.html # skip on non e10s loads, Bug 1419902. Bug 1563013 for GV+WR. Bug 1524493 GV+debug. Bug 1573281 asan
 load 1422883.html
 load 1428053.html
 load 1441029.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/base/nsPlainTextSerializer.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/base/nsPlainTextSerializer.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/base/nsPlainTextSerializer.cpp	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/base/nsPlainTextSerializer.cpp	2019-09-15 11:33:07.000000000 +0000
@@ -11,7 +11,10 @@
  */
 
 #include "nsPlainTextSerializer.h"
+
+#include "nsPrintfCString.h"
 #include "nsIServiceManager.h"
+#include "nsDebug.h"
 #include "nsGkAtoms.h"
 #include "nsNameSpaceManager.h"
 #include "nsTextFragment.h"
@@ -40,14 +43,15 @@
 #define PREF_ALWAYS_INCLUDE_RUBY "converter.html2txt.always_include_ruby"
 
 static const int32_t kTabSize = 4;
-static const int32_t kIndentSizeHeaders = 2;      /* Indention of h1, if
-                                                   mHeaderStrategy = 1 or = 2.
-                                                   Indention of other headers
-                                                   is derived from that.
-                                                   XXX center h1? */
-static const int32_t kIndentIncrementHeaders = 2; /* If mHeaderStrategy = 1,
-                                              indent h(x+1) this many
-                                              columns more than h(x) */
+static const int32_t kIndentSizeHeaders =
+    2; /* Indention of h1, if
+        mHeaderStrategy = kIndentIncreasedWithHeaderLevel
+        or = kNumberHeadingsAndIndentSlightly. Indention of
+        other headers is derived from that. */
+static const int32_t kIndentIncrementHeaders =
+    2; /* If mHeaderStrategy = kIndentIncreasedWithHeaderLevel,
+   indent h(x+1) this many
+   columns more than h(x) */
 static const int32_t kIndentSizeList = kTabSize;
 // Indention of non-first lines of ul and ol
 static const int32_t kIndentSizeDD = kTabSize;  // Indention of <dd>
@@ -102,17 +106,17 @@
   }
 }
 
-void nsPlainTextSerializer::CurrentLineContent::MaybeReplaceNbsps(
+void nsPlainTextSerializer::CurrentLine::MaybeReplaceNbspsInContent(
     const int32_t aFlags) {
   if (!(aFlags & nsIDocumentEncoder::OutputPersistNBSP)) {
     // First, replace all nbsp characters with spaces,
     // which the unicode encoder won't do for us.
-    mValue.ReplaceChar(kNBSP, kSPACE);
+    mContent.ReplaceChar(kNBSP, kSPACE);
   }
 }
 
 void nsPlainTextSerializer::CurrentLine::ResetContentAndIndentationHeader() {
-  mContent.mValue.Truncate();
+  mContent.Truncate();
   mIndentation.mHeader.Truncate();
 }
 
@@ -132,7 +136,7 @@
     aCurrentLine.CreateQuotesAndIndent(quotesAndIndent);
 
     if ((aStripTrailingWhitespaces == StripTrailingWhitespaces::kMaybe)) {
-      const bool stripTrailingSpaces = aCurrentLine.mContent.mValue.IsEmpty();
+      const bool stripTrailingSpaces = aCurrentLine.mContent.IsEmpty();
       if (stripTrailingSpaces) {
         quotesAndIndent.Trim(" ", false, true, false);
       }
@@ -141,7 +145,7 @@
     Append(quotesAndIndent);
   }
 
-  Append(aCurrentLine.mContent.mValue);
+  Append(aCurrentLine.mContent);
 }
 
 void nsPlainTextSerializer::OutputManager::Append(const nsAString& aString) {
@@ -210,6 +214,36 @@
   NS_WARNING_ASSERTION(mHeadLevel == 0, "Wrong head level!");
 }
 
+nsPlainTextSerializer::Settings::HeaderStrategy
+nsPlainTextSerializer::Settings::Convert(const int32_t aPrefHeaderStrategy) {
+  HeaderStrategy result{HeaderStrategy::kIndentIncreasedWithHeaderLevel};
+
+  switch (aPrefHeaderStrategy) {
+    case 0: {
+      result = HeaderStrategy::kNoIndentation;
+      break;
+    }
+    case 1: {
+      result = HeaderStrategy::kIndentIncreasedWithHeaderLevel;
+      break;
+    }
+    case 2: {
+      result = HeaderStrategy::kNumberHeadingsAndIndentSlightly;
+      break;
+    }
+    default: {
+      NS_WARNING(
+          nsPrintfCString("Header strategy pref contains undefined value: %i",
+                          aPrefHeaderStrategy)
+              .get());
+    }
+  }
+
+  return result;
+}
+
+const int32_t kDefaultHeaderStrategy = 1;
+
 void nsPlainTextSerializer::Settings::Init(const int32_t aFlags) {
   mFlags = aFlags;
 
@@ -217,8 +251,9 @@
     // Get some prefs that controls how we do formatted output
     mStructs = Preferences::GetBool(PREF_STRUCTS, mStructs);
 
-    mHeaderStrategy =
-        Preferences::GetInt(PREF_HEADER_STRATEGY, mHeaderStrategy);
+    int32_t headerStrategy =
+        Preferences::GetInt(PREF_HEADER_STRATEGY, kDefaultHeaderStrategy);
+    mHeaderStrategy = Convert(headerStrategy);
   }
 
   // The pref is default inited to false in libpref, but we use true
@@ -661,7 +696,7 @@
     // Indent here to support nested lists, which aren't included in li :-(
     EnsureVerticalSpace(mULCount + mOLStackIndex == 0 ? 1 : 0);
     // Must end the current line before we change indention
-    mCurrentLine.mIndentation.mWidth += kIndentSizeList;
+    mCurrentLine.mIndentation.mLength += kIndentSizeList;
     mULCount++;
   } else if (aTag == nsGkAtoms::ol) {
     EnsureVerticalSpace(mULCount + mOLStackIndex == 0 ? 1 : 0);
@@ -680,7 +715,7 @@
     } else {
       mOLStackIndex++;
     }
-    mCurrentLine.mIndentation.mWidth += kIndentSizeList;  // see ul
+    mCurrentLine.mIndentation.mLength += kIndentSizeList;  // see ul
   } else if (aTag == nsGkAtoms::li &&
              mSettings.HasFlag(nsIDocumentEncoder::OutputFormatted)) {
     if (mTagStackIndex > 1 && IsInOL()) {
@@ -713,7 +748,7 @@
     EnsureVerticalSpace(0);
   } else if (aTag == nsGkAtoms::dd) {
     EnsureVerticalSpace(0);
-    mCurrentLine.mIndentation.mWidth += kIndentSizeDD;
+    mCurrentLine.mIndentation.mLength += kIndentSizeDD;
   } else if (aTag == nsGkAtoms::span) {
     ++mSpanLevel;
   } else if (aTag == nsGkAtoms::blockquote) {
@@ -724,7 +759,7 @@
       mCurrentLine.mCiteQuoteLevel++;
     } else {
       EnsureVerticalSpace(1);
-      mCurrentLine.mIndentation.mWidth +=
+      mCurrentLine.mIndentation.mLength +=
           kTabSize;  // Check for some maximum value?
     }
   } else if (aTag == nsGkAtoms::q) {
@@ -752,8 +787,9 @@
   if (aTag == nsGkAtoms::h1 || aTag == nsGkAtoms::h2 || aTag == nsGkAtoms::h3 ||
       aTag == nsGkAtoms::h4 || aTag == nsGkAtoms::h5 || aTag == nsGkAtoms::h6) {
     EnsureVerticalSpace(2);
-    if (mSettings.GetHeaderStrategy() == 2) {  // numbered
-      mCurrentLine.mIndentation.mWidth += kIndentSizeHeaders;
+    if (mSettings.GetHeaderStrategy() ==
+        Settings::HeaderStrategy::kNumberHeadingsAndIndentSlightly) {
+      mCurrentLine.mIndentation.mLength += kIndentSizeHeaders;
       // Caching
       int32_t level = HeaderLevel(aTag);
       // Increase counter for current level
@@ -773,11 +809,12 @@
       }
       leadup.Append(char16_t(' '));
       Write(leadup);
-    } else if (mSettings.GetHeaderStrategy() == 1) {  // indent increasingly
-      mCurrentLine.mIndentation.mWidth += kIndentSizeHeaders;
+    } else if (mSettings.GetHeaderStrategy() ==
+               Settings::HeaderStrategy::kIndentIncreasedWithHeaderLevel) {
+      mCurrentLine.mIndentation.mLength += kIndentSizeHeaders;
       for (int32_t i = HeaderLevel(aTag); i > 1; i--) {
         // for h(x), run x-1 times
-        mCurrentLine.mIndentation.mWidth += kIndentIncrementHeaders;
+        mCurrentLine.mIndentation.mLength += kIndentIncrementHeaders;
       }
     }
   } else if (aTag == nsGkAtoms::sup && mSettings.GetStructs() &&
@@ -890,7 +927,7 @@
     mLineBreakDue = true;
   } else if (aTag == nsGkAtoms::ul) {
     mOutputManager->Flush(mCurrentLine);
-    mCurrentLine.mIndentation.mWidth -= kIndentSizeList;
+    mCurrentLine.mIndentation.mLength -= kIndentSizeList;
     if (--mULCount + mOLStackIndex == 0) {
       mFloatingLines = 1;
       mLineBreakDue = true;
@@ -898,7 +935,7 @@
   } else if (aTag == nsGkAtoms::ol) {
     mOutputManager->Flush(mCurrentLine);  // Doing this after decreasing
                                           // OLStackIndex would be wrong.
-    mCurrentLine.mIndentation.mWidth -= kIndentSizeList;
+    mCurrentLine.mIndentation.mLength -= kIndentSizeList;
     NS_ASSERTION(mOLStackIndex, "Wrong OLStack level!");
     mOLStackIndex--;
     if (mULCount + mOLStackIndex == 0) {
@@ -910,7 +947,7 @@
     mLineBreakDue = true;
   } else if (aTag == nsGkAtoms::dd) {
     mOutputManager->Flush(mCurrentLine);
-    mCurrentLine.mIndentation.mWidth -= kIndentSizeDD;
+    mCurrentLine.mIndentation.mLength -= kIndentSizeDD;
   } else if (aTag == nsGkAtoms::span) {
     NS_ASSERTION(mSpanLevel, "Span level will be negative!");
     --mSpanLevel;
@@ -929,7 +966,7 @@
       mFloatingLines = 0;
       mHasWrittenCiteBlockquote = true;
     } else {
-      mCurrentLine.mIndentation.mWidth -= kTabSize;
+      mCurrentLine.mIndentation.mLength -= kTabSize;
       mFloatingLines = 1;
     }
     mLineBreakDue = true;
@@ -962,13 +999,18 @@
 
   if (aTag == nsGkAtoms::h1 || aTag == nsGkAtoms::h2 || aTag == nsGkAtoms::h3 ||
       aTag == nsGkAtoms::h4 || aTag == nsGkAtoms::h5 || aTag == nsGkAtoms::h6) {
-    if (mSettings.GetHeaderStrategy()) { /*numbered or indent increasingly*/
-      mCurrentLine.mIndentation.mWidth -= kIndentSizeHeaders;
+    using HeaderStrategy = Settings::HeaderStrategy;
+    if ((mSettings.GetHeaderStrategy() ==
+         HeaderStrategy::kIndentIncreasedWithHeaderLevel) ||
+        (mSettings.GetHeaderStrategy() ==
+         HeaderStrategy::kNumberHeadingsAndIndentSlightly)) {
+      mCurrentLine.mIndentation.mLength -= kIndentSizeHeaders;
     }
-    if (mSettings.GetHeaderStrategy() == 1 /*indent increasingly*/) {
+    if (mSettings.GetHeaderStrategy() ==
+        HeaderStrategy::kIndentIncreasedWithHeaderLevel) {
       for (int32_t i = HeaderLevel(aTag); i > 1; i--) {
         // for h(x), run x-1 times
-        mCurrentLine.mIndentation.mWidth -= kIndentIncrementHeaders;
+        mCurrentLine.mIndentation.mLength -= kIndentIncrementHeaders;
       }
     }
     EnsureVerticalSpace(1);
@@ -1149,8 +1191,8 @@
 }
 
 void nsPlainTextSerializer::OutputManager::Flush(CurrentLine& aCurrentLine) {
-  if (!aCurrentLine.mContent.mValue.IsEmpty()) {
-    aCurrentLine.mContent.MaybeReplaceNbsps(mFlags);
+  if (!aCurrentLine.mContent.IsEmpty()) {
+    aCurrentLine.MaybeReplaceNbspsInContent(mFlags);
 
     Append(aCurrentLine, StripTrailingWhitespaces::kNo);
 
@@ -1169,12 +1211,11 @@
   }
 
   const uint32_t prefixwidth = mCurrentLine.DeterminePrefixWidth();
-  int32_t linelength = mCurrentLine.mContent.mValue.Length();
+  int32_t linelength = mCurrentLine.mContent.Length();
 
   // The width of the line as it will appear on the screen (approx.).
-  uint32_t currentLineContentWidth =
-      GetUnicharStringWidth(mCurrentLine.mContent.mValue.get(),
-                            mCurrentLine.mContent.mValue.Length());
+  uint32_t currentLineContentWidth = GetUnicharStringWidth(
+      mCurrentLine.mContent.get(), mCurrentLine.mContent.Length());
 
   // Yes, wrap!
   // The "+4" is to avoid wrap lines that only would be a couple
@@ -1183,24 +1224,23 @@
   uint32_t bonuswidth = (mWrapColumn > 20) ? 4 : 0;
 
   while (currentLineContentWidth + prefixwidth > mWrapColumn + bonuswidth) {
-    // We go from the end removing one letter at a time until
-    // we have a reasonable width
-    int32_t goodSpace = mCurrentLine.mContent.mValue.Length();
-    uint32_t width = currentLineContentWidth;
-    while (goodSpace > 0 && (width + prefixwidth > mWrapColumn)) {
-      goodSpace--;
-      width -= GetUnicharWidth(mCurrentLine.mContent.mValue[goodSpace]);
-    }
-
-    goodSpace++;
+    int32_t goodSpace = mCurrentLine.mContent.Length();
 
     if (mLineBreaker) {
-      goodSpace =
-          mLineBreaker->Prev(mCurrentLine.mContent.mValue.get(),
-                             mCurrentLine.mContent.mValue.Length(), goodSpace);
+      // We go from the end removing one letter at a time until
+      // we have a reasonable width
+      uint32_t width = currentLineContentWidth;
+      while (goodSpace > 0 && (width + prefixwidth > mWrapColumn)) {
+        goodSpace--;
+        width -= GetUnicharWidth(mCurrentLine.mContent[goodSpace]);
+      }
+
+      goodSpace++;
+
+      goodSpace = mLineBreaker->Prev(mCurrentLine.mContent.get(),
+                                     mCurrentLine.mContent.Length(), goodSpace);
       if (goodSpace != NS_LINEBREAKER_NEED_MORE_TEXT &&
-          nsCRT::IsAsciiSpace(
-              mCurrentLine.mContent.mValue.CharAt(goodSpace - 1))) {
+          nsCRT::IsAsciiSpace(mCurrentLine.mContent.CharAt(goodSpace - 1))) {
         --goodSpace;  // adjust the position since line breaker returns a
                       // position next to space
       }
@@ -1210,14 +1250,13 @@
       // https://bugzilla.mozilla.org/show_bug.cgi?id=333064 for more
       // information.
 
-      if (mCurrentLine.mContent.mValue.IsEmpty() || mWrapColumn < prefixwidth) {
+      if (mCurrentLine.mContent.IsEmpty() || mWrapColumn < prefixwidth) {
         goodSpace = NS_LINEBREAKER_NEED_MORE_TEXT;
       } else {
         goodSpace = std::min(mWrapColumn - prefixwidth,
-                             mCurrentLine.mContent.mValue.Length() - 1);
+                             mCurrentLine.mContent.Length() - 1);
         while (goodSpace >= 0 &&
-               !nsCRT::IsAsciiSpace(
-                   mCurrentLine.mContent.mValue.CharAt(goodSpace))) {
+               !nsCRT::IsAsciiSpace(mCurrentLine.mContent.CharAt(goodSpace))) {
           goodSpace--;
         }
       }
@@ -1230,12 +1269,12 @@
       goodSpace =
           (prefixwidth > mWrapColumn + 1) ? 1 : mWrapColumn - prefixwidth + 1;
       if (mLineBreaker) {
-        if ((uint32_t)goodSpace < mCurrentLine.mContent.mValue.Length())
-          goodSpace = mLineBreaker->Next(mCurrentLine.mContent.mValue.get(),
-                                         mCurrentLine.mContent.mValue.Length(),
-                                         goodSpace);
+        if ((uint32_t)goodSpace < mCurrentLine.mContent.Length())
+          goodSpace =
+              mLineBreaker->Next(mCurrentLine.mContent.get(),
+                                 mCurrentLine.mContent.Length(), goodSpace);
         if (goodSpace == NS_LINEBREAKER_NEED_MORE_TEXT)
-          goodSpace = mCurrentLine.mContent.mValue.Length();
+          goodSpace = mCurrentLine.mContent.Length();
       } else {
         // In this case we don't want strings, especially CJK-ones, to be
         // split. See
@@ -1243,8 +1282,7 @@
         // information.
         goodSpace = (prefixwidth > mWrapColumn) ? 1 : mWrapColumn - prefixwidth;
         while (goodSpace < linelength &&
-               !nsCRT::IsAsciiSpace(
-                   mCurrentLine.mContent.mValue.CharAt(goodSpace))) {
+               !nsCRT::IsAsciiSpace(mCurrentLine.mContent.CharAt(goodSpace))) {
           goodSpace++;
         }
       }
@@ -1255,18 +1293,16 @@
 
       // -1 (trim a char at the break position)
       // only if the line break was a space.
-      if (nsCRT::IsAsciiSpace(mCurrentLine.mContent.mValue.CharAt(goodSpace))) {
-        mCurrentLine.mContent.mValue.Right(restOfLine,
-                                           linelength - goodSpace - 1);
+      if (nsCRT::IsAsciiSpace(mCurrentLine.mContent.CharAt(goodSpace))) {
+        mCurrentLine.mContent.Right(restOfLine, linelength - goodSpace - 1);
       } else {
-        mCurrentLine.mContent.mValue.Right(restOfLine, linelength - goodSpace);
+        mCurrentLine.mContent.Right(restOfLine, linelength - goodSpace);
       }
       // if breaker was U+0020, it has to consider for delsp=yes support
-      const bool breakBySpace =
-          mCurrentLine.mContent.mValue.CharAt(goodSpace) == ' ';
-      mCurrentLine.mContent.mValue.Truncate(goodSpace);
+      const bool breakBySpace = mCurrentLine.mContent.CharAt(goodSpace) == ' ';
+      mCurrentLine.mContent.Truncate(goodSpace);
       EndLine(true, breakBySpace);
-      mCurrentLine.mContent.mValue.Truncate();
+      mCurrentLine.mContent.Truncate();
       // Space stuff new line?
       if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed)) {
         if (!restOfLine.IsEmpty() && IsSpaceStuffable(restOfLine.get()) &&
@@ -1274,15 +1310,14 @@
                 0  // We space-stuff quoted lines anyway
         ) {
           // Space stuffing a la RFC 2646 (format=flowed).
-          mCurrentLine.mContent.mValue.Append(char16_t(' '));
+          mCurrentLine.mContent.Append(char16_t(' '));
           // XXX doesn't seem to work correctly for ' '
         }
       }
-      mCurrentLine.mContent.mValue.Append(restOfLine);
-      currentLineContentWidth =
-          GetUnicharStringWidth(mCurrentLine.mContent.mValue.get(),
-                                mCurrentLine.mContent.mValue.Length());
-      linelength = mCurrentLine.mContent.mValue.Length();
+      mCurrentLine.mContent.Append(restOfLine);
+      currentLineContentWidth = GetUnicharStringWidth(
+          mCurrentLine.mContent.get(), mCurrentLine.mContent.Length());
+      linelength = mCurrentLine.mContent.Length();
       mEmptyLines = -1;
     } else {
       // Nothing to do. Hopefully we get more data later
@@ -1302,7 +1337,7 @@
                                       int32_t aLineFragmentLength) {
   if (mLineBreakDue) EnsureVerticalSpace(mFloatingLines);
 
-  if (mCurrentLine.mContent.mValue.IsEmpty()) {
+  if (mCurrentLine.mContent.IsEmpty()) {
     if (0 == aLineFragmentLength) {
       return;
     }
@@ -1313,13 +1348,13 @@
               0  // We space-stuff quoted lines anyway
       ) {
         // Space stuffing a la RFC 2646 (format=flowed).
-        mCurrentLine.mContent.mValue.Append(char16_t(' '));
+        mCurrentLine.mContent.Append(char16_t(' '));
       }
     }
     mEmptyLines = -1;
   }
 
-  mCurrentLine.mContent.mValue.Append(aLineFragment, aLineFragmentLength);
+  mCurrentLine.mContent.Append(aLineFragment, aLineFragmentLength);
 
   MaybeWrapAndOutputCompleteLines();
 }
@@ -1337,12 +1372,12 @@
 }
 
 /**
- * Outputs the contents of mCurrentLine.mContent.mValue, and resets line
+ * Outputs the contents of mCurrentLine.mContent, and resets line
  * specific variables. Also adds an indentation and prefix if there is one
  * specified. Strips ending spaces from the line if it isn't preformatted.
  */
 void nsPlainTextSerializer::EndLine(bool aSoftLineBreak, bool aBreakBySpace) {
-  if (aSoftLineBreak && mCurrentLine.mContent.mValue.IsEmpty()) {
+  if (aSoftLineBreak && mCurrentLine.mContent.IsEmpty()) {
     // No meaning
     return;
   }
@@ -1354,13 +1389,13 @@
    * signed messages according to the OpenPGP standard (RFC 2440).
    */
   if (!mSettings.HasFlag(nsIDocumentEncoder::OutputPreformatted) &&
-      (aSoftLineBreak || !IsSignatureSeparator(mCurrentLine.mContent.mValue))) {
-    mCurrentLine.mContent.mValue.Trim(" ", false, true, false);
+      (aSoftLineBreak || !IsSignatureSeparator(mCurrentLine.mContent))) {
+    mCurrentLine.mContent.Trim(" ", false, true, false);
   }
 
   if (aSoftLineBreak &&
       mSettings.HasFlag(nsIDocumentEncoder::OutputFormatFlowed) &&
-      (mCurrentLine.mIndentation.mWidth == 0)) {
+      (mCurrentLine.mIndentation.mLength == 0)) {
     // Add the soft part of the soft linebreak (RFC 2646 4.1)
     // We only do this when there is no indentation since format=flowed
     // lines and indentation doesn't work well together.
@@ -1369,9 +1404,9 @@
     // add twice space.
     if (mSettings.HasFlag(nsIDocumentEncoder::OutputFormatDelSp) &&
         aBreakBySpace) {
-      mCurrentLine.mContent.mValue.AppendLiteral("  ");
+      mCurrentLine.mContent.AppendLiteral("  ");
     } else {
-      mCurrentLine.mContent.mValue.Append(char16_t(' '));
+      mCurrentLine.mContent.Append(char16_t(' '));
     }
   }
 
@@ -1380,15 +1415,15 @@
   } else {
     // Hard break
     if (mCurrentLine.HasContentOrIndentationHeader()) {
-      mEmptyLines = -1;
+      mEmptyLines = 0;
+    } else {
+      mEmptyLines++;
     }
-
-    mEmptyLines++;
   }
 
   MOZ_ASSERT(mOutputManager);
 
-  mCurrentLine.mContent.MaybeReplaceNbsps(mSettings.GetFlags());
+  mCurrentLine.MaybeReplaceNbspsInContent(mSettings.GetFlags());
 
   // If we don't have anything "real" to output we have to
   // make sure the indent doesn't end in a space since that
@@ -1414,7 +1449,7 @@
     for (int i = 0; i < mCiteQuoteLevel; i++) {
       quotes.Append(char16_t('>'));
     }
-    if (!mContent.mValue.IsEmpty()) {
+    if (!mContent.IsEmpty()) {
       /* Better don't output a space here, if the line is empty,
          in case a receiving format=flowed-aware UA thinks, this were a flowed
          line, which it isn't - it's just empty. (Flowed lines may be joined
@@ -1425,7 +1460,7 @@
   }
 
   // Indent if necessary
-  int32_t indentwidth = mIndentation.mWidth - mIndentation.mHeader.Length();
+  int32_t indentwidth = mIndentation.mLength - mIndentation.mHeader.Length();
   if (indentwidth > 0 && HasContentOrIndentationHeader()
       // Don't make empty lines look flowed
   ) {
@@ -1522,12 +1557,12 @@
         stringpart.Trim(" ", false, true, true);
       }
       if (IsSpaceStuffable(stringpart.get()) && !IsQuotedLine(stringpart)) {
-        mCurrentLine.mContent.mValue.Append(char16_t(' '));
+        mCurrentLine.mContent.Append(char16_t(' '));
       }
     }
-    mCurrentLine.mContent.mValue.Append(stringpart);
+    mCurrentLine.mContent.Append(stringpart);
 
-    mCurrentLine.mContent.MaybeReplaceNbsps(mSettings.GetFlags());
+    mCurrentLine.MaybeReplaceNbspsInContent(mSettings.GetFlags());
 
     mOutputManager->Append(mCurrentLine,
                            OutputManager::StripTrailingWhitespaces::kNo);
@@ -1577,16 +1612,17 @@
       (mSpanLevel > 0 && mEmptyLines >= 0 && IsQuotedLine(str))) {
     // No intelligent wrapping.
 
-    // This mustn't be mixed with intelligent wrapping without clearing
-    // the mCurrentLine.mContent.mValue buffer before!!!
-    NS_ASSERTION(mCurrentLine.mContent.mValue.IsEmpty() ||
-                     (IsElementPreformatted() && !mPreFormattedMail),
-                 "Mixed wrapping data and nonwrapping data on the same line");
-    MOZ_ASSERT(mOutputManager);
+        // This mustn't be mixed with intelligent wrapping without clearing
+        // the mCurrentLine.mContent buffer before!!!
+        NS_ASSERTION(
+            mCurrentLine.mContent.IsEmpty() ||
+                (IsElementPreformatted() && !mPreFormattedMail),
+            "Mixed wrapping data and nonwrapping data on the same line");
+        MOZ_ASSERT(mOutputManager);
 
-    if (!mCurrentLine.mContent.mValue.IsEmpty()) {
-      mOutputManager->Flush(mCurrentLine);
-    }
+        if (!mCurrentLine.mContent.IsEmpty()) {
+          mOutputManager->Flush(mCurrentLine);
+        }
 
     ConvertToLinesAndOutput(str);
     return;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/base/nsPlainTextSerializer.h firefox-trunk-71.0~a1~hg20190915r493291/dom/base/nsPlainTextSerializer.h
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/base/nsPlainTextSerializer.h	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/base/nsPlainTextSerializer.h	2019-09-15 11:33:07.000000000 +0000
@@ -159,6 +159,12 @@
 
   class Settings {
    public:
+    enum class HeaderStrategy {
+      kNoIndentation,
+      kIndentIncreasedWithHeaderLevel,
+      kNumberHeadingsAndIndentSlightly
+    };
+
     // May adapt the flags.
     //
     // @param aFlags As defined in nsIDocumentEncoder.idl.
@@ -168,7 +174,7 @@
     bool GetStructs() const { return mStructs; }
 
     // Pref: converter.html2txt.header_strategy.
-    int32_t GetHeaderStrategy() const { return mHeaderStrategy; }
+    HeaderStrategy GetHeaderStrategy() const { return mHeaderStrategy; }
 
     // @return As defined in nsIDocumentEncoder.idl.
     int32_t GetFlags() const { return mFlags; }
@@ -181,15 +187,15 @@
     bool GetWithRubyAnnotation() const { return mWithRubyAnnotation; }
 
    private:
+    // @param aPrefHeaderStrategy Pref: converter.html2txt.header_strategy.
+    static HeaderStrategy Convert(int32_t aPrefHeaderStrategy);
+
     // Pref: converter.html2txt.structs.
     bool mStructs = true;
 
     // Pref: converter.html2txt.header_strategy.
-    int32_t mHeaderStrategy = 1; /* Header strategy (pref)
-                                  0 = no indention
-                                  1 = indention, increased with
-                                      header level (default)
-                                  2 = numbering and slight indention */
+    HeaderStrategy mHeaderStrategy =
+        HeaderStrategy::kIndentIncreasedWithHeaderLevel;
 
     // Flags defined in nsIDocumentEncoder.idl.
     int32_t mFlags = 0;
@@ -201,38 +207,33 @@
   Settings mSettings;
 
   struct Indentation {
-    // The number of space characters to be inserted including the number of
-    // characters in mHeader.
-    int32_t mWidth = 0;
+    // The number of space characters to be inserted including the length of
+    // mHeader.
+    int32_t mLength = 0;
 
     // The header that has to be written in the indent.
     // That could be, for instance, the bullet in a bulleted list.
     nsString mHeader;
   };
 
-  // Excludes indentation and quotes.
-  class CurrentLineContent {
-   public:
-    // @param aFlags As defined in nsIDocumentEncoder.idl.
-    void MaybeReplaceNbsps(int32_t aFlags);
-
-    nsString mValue;
-  };
-
   class CurrentLine {
    public:
     void ResetContentAndIndentationHeader();
 
+    // @param aFlags As defined in nsIDocumentEncoder.idl.
+    void MaybeReplaceNbspsInContent(int32_t aFlags);
+
     void CreateQuotesAndIndent(nsAString& aResult) const;
 
     bool HasContentOrIndentationHeader() const {
-      return !mContent.mValue.IsEmpty() || !mIndentation.mHeader.IsEmpty();
+      return !mContent.IsEmpty() || !mIndentation.mHeader.IsEmpty();
     }
 
     // @return Combined width of cite quote level and indentation.
     uint32_t DeterminePrefixWidth() const {
       // XXX: Should calculate prefixwidth with GetUnicharStringWidth
-      return (mCiteQuoteLevel > 0 ? mCiteQuoteLevel + 1 : 0) + mIndentation.mWidth;
+      return (mCiteQuoteLevel > 0 ? mCiteQuoteLevel + 1 : 0) +
+             mIndentation.mLength;
     }
 
     Indentation mIndentation;
@@ -240,7 +241,8 @@
     // The number of '>' characters.
     int32_t mCiteQuoteLevel = 0;
 
-    CurrentLineContent mContent;
+    // Excludes indentation and quotes.
+    nsString mContent;
   };
 
   CurrentLine mCurrentLine;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/cache/QuotaClient.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/cache/QuotaClient.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/cache/QuotaClient.cpp	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/cache/QuotaClient.cpp	2019-09-15 11:33:08.000000000 +0000
@@ -49,6 +49,10 @@
   nsCOMPtr<nsIFile> file;
   while (NS_SUCCEEDED(rv = entries->GetNextFile(getter_AddRefs(file))) &&
          file && !aCanceled) {
+    if (NS_WARN_IF(QuotaManager::IsShuttingDown())) {
+      return NS_ERROR_ABORT;
+    }
+
     bool isDir;
     rv = file->IsDirectory(&isDir);
     if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -428,6 +432,10 @@
     nsCOMPtr<nsIFile> file;
     while (NS_SUCCEEDED(rv = entries->GetNextFile(getter_AddRefs(file))) &&
            file && !aCanceled) {
+      if (NS_WARN_IF(QuotaManager::IsShuttingDown())) {
+        return NS_ERROR_ABORT;
+      }
+
       nsAutoString leafName;
       rv = file->GetLeafName(leafName);
       if (NS_WARN_IF(NS_FAILED(rv))) {
@@ -448,8 +456,10 @@
         if (leafName.EqualsLiteral("morgue")) {
           rv = GetBodyUsage(file, aCanceled, aUsageInfo);
           if (NS_WARN_IF(NS_FAILED(rv))) {
-            REPORT_TELEMETRY_ERR_IN_INIT(aInitializing, kQuotaExternalError,
-                                         Cache_GetBodyUsage);
+            if (rv != NS_ERROR_ABORT) {
+              REPORT_TELEMETRY_ERR_IN_INIT(aInitializing, kQuotaExternalError,
+                                           Cache_GetBodyUsage);
+            }
             return rv;
           }
         } else {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/canvas/test/mochitest.ini firefox-trunk-71.0~a1~hg20190915r493291/dom/canvas/test/mochitest.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/canvas/test/mochitest.ini	2019-09-13 05:13:12.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/canvas/test/mochitest.ini	2019-09-15 11:33:08.000000000 +0000
@@ -229,7 +229,6 @@
 [test_drawSnapshot.html]
 support-files = file_drawWindow_source.html file_drawWindow_common.js
 [test_imagebitmap.html]
-skip-if = android_version == '19' # bug 1336581
 tags = imagebitmap
 [test_imagebitmap_close.html]
 tags = imagebitmap
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/chrome-webidl/JSWindowActor.webidl firefox-trunk-71.0~a1~hg20190915r493291/dom/chrome-webidl/JSWindowActor.webidl
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/chrome-webidl/JSWindowActor.webidl	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/chrome-webidl/JSWindowActor.webidl	2019-09-15 11:33:08.000000000 +0000
@@ -10,13 +10,11 @@
 interface JSWindowActor {
   [Throws]
   void sendAsyncMessage(DOMString messageName,
-                        optional any obj,
-                        optional any transfers);
+                        optional any obj);
 
   [Throws]
   Promise<any> sendQuery(DOMString messageName,
-                         optional any obj,
-                         optional any transfers);
+                         optional any obj);
 };
 
 [ChromeOnly]
@@ -130,9 +128,12 @@
   sequence<DOMString> matches;
 
   /**
-   * Optional list of regular expressions for remoteTypes which are
-   * allowed to instantiate this actor. If not passed, all content
-   * processes are allowed to instantiate the actor.
+   * An array of remote type which restricts the actor is allowed to instantiate
+   * in specific process type. If this is defined, the prefix of process type
+   * matches the remote type by prefix match is allowed to instantiate, ex: if
+   * Fission is enabled, the prefix of process type will be `webIsolated`, it
+   * can prefix match remote type either `web` or `webIsolated`. If not passed,
+   * all content processes are allowed to instantiate the actor.
    */
   sequence<DOMString> remoteTypes;
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/docs/Fission.rst firefox-trunk-71.0~a1~hg20190915r493291/dom/docs/Fission.rst
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/docs/Fission.rst	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/docs/Fission.rst	2019-09-15 11:33:09.000000000 +0000
@@ -100,12 +100,10 @@
 
 This has a similar signature as the ``sendAsyncMessage`` method for Message Managers::
 
-    sendAsyncMessage("SomeMessage", { key: "value" }, { transferredObject });
+    sendAsyncMessage("SomeMessage", { key: "value" });
 
 Like messages sent via the Message Manager, anything that can be serialized using the structured clone algorithm can be sent down through the second argument. Additionally, ``nsIPrincipal``'s can be sent without manually serializing and deserializing them.
 
-The third argument sends `Transferables`_ to the receiver, for example an ``ArrayBuffer``.
-
 .. note::
     Cross Process Object Wrappers (CPOWs) cannot be sent over JSWindowActors.
 
@@ -117,7 +115,7 @@
 
 ``sendQuery`` improves upon ``sendAsyncMessage`` by returning a ``Promise``. The receiver of the message must then return a ``Promise`` that can eventually resolve into a value - at which time the ``sendQuery`` ``Promise`` resolves with that value.
 
-The ``sendQuery`` method arguments follow the same conventions as ``sendAsyncMessage``, with the second argument being a structured clone, and the third being for `Transferables`_.
+The ``sendQuery`` method arguments follow the same conventions as ``sendAsyncMessage``, with the second argument being a structured clone.
 
 ``receiveMessage``
 ``````````````````
@@ -471,7 +469,6 @@
 
 .. _Electrolysis Project: https://wiki.mozilla.org/Electrolysis
 .. _IPC Actors: https://developer.mozilla.org/en-US/docs/Mozilla/IPDL/Tutorial
-.. _Transferables: https://developer.mozilla.org/en-US/docs/Web/API/Transferable
 .. _Context Menu Fission Port: https://hg.mozilla.org/mozilla-central/rev/adc60720b7b8
 .. _ContentDOMReference.jsm: https://searchfox.org/mozilla-central/source/toolkit/modules/ContentDOMReference.jsm
 .. _JSWindowActor.webidl: https://searchfox.org/mozilla-central/source/dom/chrome-webidl/JSWindowActor.webidl
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/html/nsGenericHTMLElement.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/html/nsGenericHTMLElement.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/html/nsGenericHTMLElement.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/html/nsGenericHTMLElement.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -236,16 +236,13 @@
     }
   }
 
-  // Subtract the parent border unless it uses border-box sizing.
-  if (parent && parent->StylePosition()->mBoxSizing != StyleBoxSizing::Border) {
+  // Make the position relative to the padding edge.
+  if (parent) {
     const nsStyleBorder* border = parent->StyleBorder();
     origin.x -= border->GetComputedBorderWidth(eSideLeft);
     origin.y -= border->GetComputedBorderWidth(eSideTop);
   }
 
-  // XXX We should really consider subtracting out padding for
-  // content-box sizing, but we should see what IE does....
-
   // Get the union of all rectangles in this and continuation frames.
   // It doesn't really matter what we use as aRelativeTo here, since
   // we only care about the size. We just have to use something non-null.
@@ -1591,17 +1588,44 @@
   return state;
 }
 
+static bool IsSameOriginAsTop(const BindContext& aContext,
+                              const nsGenericHTMLFormElement* aElement) {
+  MOZ_ASSERT(aElement);
+
+  BrowsingContext* browsingContext = aContext.OwnerDoc().GetBrowsingContext();
+  if (!browsingContext) {
+    return false;
+  }
+
+  nsPIDOMWindowOuter* topWindow = browsingContext->Top()->GetDOMWindow();
+  if (!topWindow) {
+    // If we don't have a DOMWindow, We are not in same origin.
+    return false;
+  }
+
+  Document* topLevelDocument = topWindow->GetExtantDoc();
+  if (!topLevelDocument) {
+    return false;
+  }
+
+  return NS_SUCCEEDED(
+      nsContentUtils::CheckSameOrigin(topLevelDocument, aElement));
+}
+
 nsresult nsGenericHTMLFormElement::BindToTree(BindContext& aContext,
                                               nsINode& aParent) {
   nsresult rv = nsGenericHTMLElement::BindToTree(aContext, aParent);
   NS_ENSURE_SUCCESS(rv, rv);
 
   // An autofocus event has to be launched if the autofocus attribute is
-  // specified and the element accept the autofocus attribute. In addition,
-  // the document should not be already loaded and the "browser.autofocus"
-  // preference should be 'true'.
+  // specified and the element accepts the autofocus attribute and only if the
+  // target document is in the same origin as the top level document.
+  // https://html.spec.whatwg.org/multipage/interaction.html#the-autofocus-attribute:same-origin
+  // In addition, the document should not be already loaded and the
+  // "browser.autofocus" preference should be 'true'.
   if (IsAutofocusable() && HasAttr(kNameSpaceID_None, nsGkAtoms::autofocus) &&
-      StaticPrefs::browser_autofocus() && IsInUncomposedDoc()) {
+      StaticPrefs::browser_autofocus() && IsInUncomposedDoc() &&
+      IsSameOriginAsTop(aContext, this)) {
     aContext.OwnerDoc().SetAutoFocusElement(this);
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/html/test/test_bug375003-1.html firefox-trunk-71.0~a1~hg20190915r493291/dom/html/test/test_bug375003-1.html
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/html/test/test_bug375003-1.html	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/html/test/test_bug375003-1.html	2019-09-15 11:33:09.000000000 +0000
@@ -41,8 +41,8 @@
 
 function run_test() {
    t3('span1',[0,0,20,20],[12,12,20,20],[0,0,20,20],'td1');
-   t3('td1'  ,[1,1,69,44],[16,16,71,46],[0,0,69,46],'table1');
-   t3('tr1'  ,[0,0,71,46],[16,16,71,46],[0,0,71,44],'table1');
+   t3('td1'  ,[1,1,69,44],[7,7,71,46],[0,0,69,46],'table1');
+   t3('tr1'  ,[0,0,71,46],[7,7,71,46],[0,0,71,44],'table1');
    t3('span2',[10,0,20,20],[27,12,30,20],[0,0,20,20],'td2');
    t3('table1',[0,0,103,131],[10,10,103,131],[0,0,103,131],'body');
    t3('div1',[10,10,-1,131],[0,0,-1,151],[0,0,-1,85],'body');
@@ -67,15 +67,15 @@
    t3('div5',[10,10,-1,78],[0,211,-1,98],[0,0,-1,70],'body');
 
    t3('span7' ,[0,0,20,20],[1,1,20,20],[0,0,20,20],'td7');
-   t3('td7'   ,[1,1,37,22],[9,9,39,24],[0,0,37,22],'table7');
-   t3('tr7'  ,[0,0,39,24],[9,9,39,24],[0,0,39,22],'table7');
-   t3('span8' ,[0,0,20,20],[26,37,20,20],[0,0,20,20],'table7');
+   t3('td7'   ,[1,1,37,22],[2,2,39,24],[0,0,37,22],'table7');
+   t3('tr7'  ,[0,0,39,24],[2,2,39,24],[0,0,39,22],'table7');
+   t3('span8' ,[0,0,20,20],[19,30,20,20],[0,0,20,20],'table7');
    t3('table7',[0,0,57,68],[10,319,57,68],[0,0,57,68],'body');
    t3('div7',[10,10,-1,68],[0,309,-1,88],[0,0,-1,70],'body');
 
    t3('span9' ,[0,0,20,20],[1,1,20,20],[0,0,20,20],'td9');
-   t3('td9'   ,[1,1,22,22],[15,15,24,24],[0,0,22,24],'table9');
-   t3('tr9'  ,[0,0,24,24],[15,15,24,24],[0,0,24,22],'table9');
+   t3('td9'   ,[1,1,22,22],[2,2,24,24],[0,0,22,24],'table9');
+   t3('tr9'  ,[0,0,24,24],[2,2,24,24],[0,0,24,22],'table9');
    t3('span10' ,[0,0,20,20],[17,43,20,20],[0,0,20,20],'table9');
    t3('table9',[0,0,54,60],[10,407,54,60],[0,0,54,60],'body');
    t3('div9',[10,10,-1,0],[0,397,-1,20],[0,0,-1,70],'body');
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/IDBFactory.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/IDBFactory.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/IDBFactory.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/IDBFactory.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -485,9 +485,15 @@
     }
   }
 
-  const auto principalType = IdentifyPrincipalType(*mPrincipalInfo);
-
-  Telemetry::AccumulateCategorical(principalType);
+  // Ignore calls with empty options for telemetry of usage count.
+  // Unfortunately, we cannot distinguish between the use of the method with
+  // only a single argument (which actually is a standard overload we don't want
+  // to count) an empty dictionary passed explicitly (which is the custom
+  // overload we would like to count). However, we assume that the latter is so
+  // rare that it can be neglected.
+  if (aOptions.IsAnyMemberPresent()) {
+    Telemetry::AccumulateCategorical(IdentifyPrincipalType(*mPrincipalInfo));
+  }
 
   return OpenInternal(aCx,
                       /* aPrincipal */ nullptr, aName, aOptions.mVersion,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/file.js firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/file.js
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/file.js	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/file.js	2019-09-15 11:33:09.000000000 +0000
@@ -219,14 +219,26 @@
   return utils.getFilePath(file);
 }
 
-function hasFileInfo(name, id) {
-  return utils.getFileReferences(name, id);
+function* assertEventuallyHasFileInfo(name, id) {
+  yield* assertEventuallyWithGC(
+    () => utils.getFileReferences(name, id),
+    `Expect existing FileInfo for ${name}/${id}`
+  );
 }
 
-function getFileRefCount(name, id) {
-  let count = {};
-  utils.getFileReferences(name, id, null, count);
-  return count.value;
+function* assertEventuallyHasNoFileInfo(name, id) {
+  yield* assertEventuallyWithGC(
+    () => !utils.getFileReferences(name, id),
+    `Expect no existing FileInfo for ${name}/${id}`
+  );
+}
+
+function* assertEventuallyFileRefCount(name, id, expectedCount) {
+  yield* assertEventuallyWithGC(() => {
+    let count = {};
+    utils.getFileReferences(name, id, null, count);
+    return count.value == expectedCount;
+  }, `Expect ${expectedCount} existing references for ${name}/${id}`);
 }
 
 function getFileDBRefCount(name, id) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/helpers.js firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/helpers.js
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/helpers.js	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/helpers.js	2019-09-15 11:33:09.000000000 +0000
@@ -307,6 +307,22 @@
   SpecialPowers.exactGC(continueToNextStep);
 }
 
+// Assert that eventually a condition becomes true, running a garbage
+// collection between evaluations. Fails, after a high number of iterations
+// without a successful evaluation of the condition.
+function* assertEventuallyWithGC(conditionFunctor, message) {
+  const maxGC = 100;
+  for (let i = 0; i < maxGC; ++i) {
+    if (conditionFunctor()) {
+      ok(true, message + " (after " + i + " garbage collections)");
+      return;
+    }
+    SpecialPowers.exactGC(continueToNextStep);
+    yield undefined;
+  }
+  ok(false, message + " (even after " + maxGC + " garbage collections)");
+}
+
 function isWasmSupported() {
   let testingFunctions = SpecialPowers.Cu.getJSTestingFunctions();
   return testingFunctions.wasmIsSupported();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/test_file_delete.html firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/test_file_delete.html
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/test_file_delete.html	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/test_file_delete.html	2019-09-15 11:33:09.000000000 +0000
@@ -62,12 +62,9 @@
       fileData3.file = null;
     }
 
-    scheduleGC();
-    yield undefined;
-
-    ok(!hasFileInfo(name, 1), "Correct ref count");
-    ok(hasFileInfo(name, 2), "Correct ref count");
-    ok(hasFileInfo(name, 3), "Correct ref count");
+    yield* assertEventuallyHasNoFileInfo(name, 1);
+    yield* assertEventuallyHasFileInfo(name, 2);
+    yield* assertEventuallyHasFileInfo(name, 3);
 
     {
       let request = indexedDB.open(name, 1);
@@ -110,18 +107,16 @@
 
       is(event.type, "complete", "Got correct event type");
 
-      is(getFileDBRefCount(name, 3), -1, "Correct db ref count");
+      yield *assertEventuallyWithGC(() => -1 == getFileDBRefCount(name, 3),
+                                    "Correct db ref count");
 
       event = null;
       result = null;
     }
 
-    scheduleGC();
-    yield undefined;
-
-    ok(!hasFileInfo(name, 1), "Correct ref count");
-    ok(!hasFileInfo(name, 2), "Correct ref count");
-    ok(!hasFileInfo(name, 3), "Correct ref count");
+    yield* assertEventuallyHasNoFileInfo(name, 1);
+    yield* assertEventuallyHasNoFileInfo(name, 2);
+    yield* assertEventuallyHasNoFileInfo(name, 3);
 
     finishTest();
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/test_file_resurrection_delete.html firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/test_file_resurrection_delete.html
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/test_file_resurrection_delete.html	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/test_file_resurrection_delete.html	2019-09-15 11:33:08.000000000 +0000
@@ -65,10 +65,7 @@
       fileData.file = null;
     }
 
-    scheduleGC();
-    yield undefined;
-
-    is(getFileRefCount(name, 1), 0, "Correct ref count");
+    yield* assertEventuallyFileRefCount(name, 1, 0);
 
     {
       let request = indexedDB.open(name, 1);
@@ -114,10 +111,7 @@
       result = null;
     }
 
-    scheduleGC();
-    yield undefined;
-
-    is(getFileRefCount(name, 1), 0, "Correct ref count");
+    yield* assertEventuallyFileRefCount(name, 1, 0);
 
     finishTest();
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/test_file_resurrection_transaction_abort.html firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/test_file_resurrection_transaction_abort.html
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/test_file_resurrection_transaction_abort.html	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/test_file_resurrection_transaction_abort.html	2019-09-15 11:33:09.000000000 +0000
@@ -73,10 +73,7 @@
       fileData.file = null;
     }
 
-    scheduleGC();
-    yield undefined;
-
-    is(getFileRefCount(name, 1), 0, "Correct ref count");
+    yield* assertEventuallyFileRefCount(name, 1, 0);
 
     finishTest();
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/test_file_transaction_abort.html firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/test_file_transaction_abort.html
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/indexedDB/test/test_file_transaction_abort.html	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/indexedDB/test/test_file_transaction_abort.html	2019-09-15 11:33:09.000000000 +0000
@@ -58,10 +58,7 @@
       fileData.file = null;
     }
 
-    scheduleGC();
-    yield undefined;
-
-    ok(!hasFileInfo(name, 1), "Correct ref count");
+    yield* assertEventuallyHasNoFileInfo(name, 1);
 
     finishTest();
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/JSWindowActor.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/JSWindowActor.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/JSWindowActor.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/JSWindowActor.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -89,11 +89,10 @@
 void JSWindowActor::SendAsyncMessage(JSContext* aCx,
                                      const nsAString& aMessageName,
                                      JS::Handle<JS::Value> aObj,
-                                     JS::Handle<JS::Value> aTransfers,
                                      ErrorResult& aRv) {
   ipc::StructuredCloneData data;
-  if (!nsFrameMessageManager::GetParamsForMessage(aCx, aObj, aTransfers,
-                                                  data)) {
+  if (!nsFrameMessageManager::GetParamsForMessage(
+          aCx, aObj, JS::UndefinedHandleValue, data)) {
     aRv.Throw(NS_ERROR_DOM_DATA_CLONE_ERR);
     return;
   }
@@ -108,10 +107,10 @@
 
 already_AddRefed<Promise> JSWindowActor::SendQuery(
     JSContext* aCx, const nsAString& aMessageName, JS::Handle<JS::Value> aObj,
-    JS::Handle<JS::Value> aTransfers, ErrorResult& aRv) {
+    ErrorResult& aRv) {
   ipc::StructuredCloneData data;
-  if (!nsFrameMessageManager::GetParamsForMessage(aCx, aObj, aTransfers,
-                                                  data)) {
+  if (!nsFrameMessageManager::GetParamsForMessage(
+          aCx, aObj, JS::UndefinedHandleValue, data)) {
     aRv.Throw(NS_ERROR_DOM_DATA_CLONE_ERR);
     return nullptr;
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/JSWindowActor.h firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/JSWindowActor.h
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/JSWindowActor.h	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/JSWindowActor.h	2019-09-15 11:33:09.000000000 +0000
@@ -44,13 +44,11 @@
   const nsString& Name() const { return mName; }
 
   void SendAsyncMessage(JSContext* aCx, const nsAString& aMessageName,
-                        JS::Handle<JS::Value> aObj,
-                        JS::Handle<JS::Value> aTransfers, ErrorResult& aRv);
+                        JS::Handle<JS::Value> aObj, ErrorResult& aRv);
 
   already_AddRefed<Promise> SendQuery(JSContext* aCx,
                                       const nsAString& aMessageName,
                                       JS::Handle<JS::Value> aObj,
-                                      JS::Handle<JS::Value> aTransfers,
                                       ErrorResult& aRv);
 
   void ReceiveRawMessage(const JSWindowActorMessageMeta& aMetadata,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/JSWindowActorService.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/JSWindowActorService.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/JSWindowActorService.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/JSWindowActorService.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -306,21 +306,32 @@
   return mURIMatcher;
 }
 
+bool JSWindowActorProtocol::RemoteTypePrefixMatches(
+    const nsDependentSubstring& aRemoteType) {
+  for (auto& remoteType : mRemoteTypes) {
+    if (StringBeginsWith(aRemoteType, remoteType)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 bool JSWindowActorProtocol::Matches(BrowsingContext* aBrowsingContext,
                                     nsIURI* aURI,
                                     const nsAString& aRemoteType) {
   MOZ_ASSERT(aBrowsingContext, "DocShell without a BrowsingContext!");
   MOZ_ASSERT(aURI, "Must have URI!");
 
-  if (!mRemoteTypes.IsEmpty() && !mRemoteTypes.Contains(aRemoteType)) {
+  if (!mAllFrames && aBrowsingContext->GetParent()) {
     return false;
   }
 
-  if (!mAllFrames && aBrowsingContext->GetParent()) {
+  if (!mIncludeChrome && !aBrowsingContext->IsContent()) {
     return false;
   }
 
-  if (!mIncludeChrome && !aBrowsingContext->IsContent()) {
+  if (!mRemoteTypes.IsEmpty() &&
+      !RemoteTypePrefixMatches(RemoteTypePrefix(aRemoteType))) {
     return false;
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/JSWindowActorService.h firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/JSWindowActorService.h
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/JSWindowActorService.h	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/JSWindowActorService.h	2019-09-15 11:33:09.000000000 +0000
@@ -80,6 +80,7 @@
  private:
   explicit JSWindowActorProtocol(const nsAString& aName) : mName(aName) {}
   extensions::MatchPatternSet* GetURIMatcher();
+  bool RemoteTypePrefixMatches(const nsDependentSubstring& aRemoteType);
   ~JSWindowActorProtocol() = default;
 
   nsString mName;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/tests/browser_crash_oopiframe.js firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/tests/browser_crash_oopiframe.js
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/tests/browser_crash_oopiframe.js	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/tests/browser_crash_oopiframe.js	2019-09-15 11:33:09.000000000 +0000
@@ -10,85 +10,76 @@
  */
 add_task(async function() {
   // Open a new window with fission enabled.
-  let win = await BrowserTestUtils.openNewBrowserWindow({
-    remote: true,
-    fission: true,
-  });
-
-  // Wait for the provided URL to load in our browser.
-  let url = "about:blank";
-  let browser = win.gBrowser.selectedBrowser;
-  BrowserTestUtils.loadURI(browser, url);
-  await BrowserTestUtils.browserLoaded(browser, false, url);
-
-  let rootBC = browser.browsingContext;
-
-  // Create an oop iframe.
-  let iframeID = await SpecialPowers.spawn(browser, [], async () => {
-    let iframe = content.document.createElement("iframe");
-    iframe.setAttribute("fission", "true");
-    iframe.setAttribute("src", "http://example.com");
-
-    const { ContentTaskUtils } = ChromeUtils.import(
-      "resource://testing-common/ContentTaskUtils.jsm"
-    );
-
-    content.document.body.appendChild(iframe);
-    await ContentTaskUtils.waitForEvent(iframe, "load");
-
-    let iframeBC = iframe.frameLoader.browsingContext;
-    return iframeBC.id;
-  });
-
-  let iframeBC = BrowsingContext.get(iframeID);
-  is(iframeBC.parent, rootBC, "oop frame has root as parent");
-
-  BrowserTestUtils.crashFrame(
-    browser,
-    true /* shouldShowTabCrashPage */,
-    true /* shouldClearMinidumps */,
-    iframeBC
-  );
-
-  let eventFiredPromise = BrowserTestUtils.waitForEvent(
-    browser,
-    "oop-browser-crashed"
-  );
-
-  info("Waiting for oop-browser-crashed event.");
-  await eventFiredPromise.then(event => {
-    ok(!event.isTopFrame, "should not be reporting top-level frame crash");
-
-    isnot(
-      event.browsingContextId,
-      rootBC,
-      "top frame browsing context id not expected."
-    );
-
-    is(
-      event.browsingContextId,
-      iframeBC.id,
-      "oop frame browsing context id expected."
-    );
-  });
-
-  // The BrowsingContext is re-used, but the currentWindowGlobal
-  // might still be getting set up at this point. We poll to wait
-  // until its created and available.
-  await BrowserTestUtils.waitForCondition(() => {
-    return iframeBC.currentWindowGlobal;
-  });
-
-  let newIframeURI = await SpecialPowers.spawn(
-    iframeBC,
-    [],
-    () => content.document.documentURI
-  );
-
   ok(
-    newIframeURI.startsWith("about:framecrashed"),
-    "The iframe is now pointing at about:framecrashed"
+    SpecialPowers.useRemoteSubframes,
+    "This test only makes sense of we can use OOP iframes."
   );
 
-  await BrowserTestUtils.closeWindow(win);
+  await BrowserTestUtils.withNewTab(
+    {
+      gBrowser,
+      url: "about:blank",
+    },
+    async browser => {
+      let rootBC = browser.browsingContext;
+
+      // If we load example.com in an injected subframe, we assume that this
+      // will load in its own subprocess, which we can then crash.
+      let iframeBC = await SpecialPowers.spawn(browser, [], async () => {
+        let iframe = content.document.createElement("iframe");
+        iframe.setAttribute("src", "http://example.com");
+
+        content.document.body.appendChild(iframe);
+        await ContentTaskUtils.waitForEvent(iframe, "load");
+        return iframe.frameLoader.browsingContext;
+      });
+
+      is(iframeBC.parent, rootBC, "oop frame has root as parent");
+
+      let eventFiredPromise = BrowserTestUtils.waitForEvent(
+        browser,
+        "oop-browser-crashed"
+      );
+
+      BrowserTestUtils.crashFrame(
+        browser,
+        true /* shouldShowTabCrashPage */,
+        true /* shouldClearMinidumps */,
+        iframeBC
+      );
+
+      info("Waiting for oop-browser-crashed event.");
+      await eventFiredPromise.then(event => {
+        ok(!event.isTopFrame, "should not be reporting top-level frame crash");
+
+        isnot(
+          event.browsingContextId,
+          rootBC,
+          "top frame browsing context id not expected."
+        );
+
+        is(
+          event.browsingContextId,
+          iframeBC.id,
+          "oop frame browsing context id expected."
+        );
+      });
+
+      // The BrowsingContext is re-used, but the currentWindowGlobal
+      // might still be getting set up at this point. We poll to wait
+      // until its created and available.
+      await BrowserTestUtils.waitForCondition(() => {
+        return iframeBC.currentWindowGlobal;
+      });
+
+      let newIframeURI = await SpecialPowers.spawn(iframeBC, [], async () => {
+        return content.document.documentURI;
+      });
+
+      ok(
+        newIframeURI.startsWith("about:framecrashed"),
+        "The iframe is now pointing at about:framecrashed"
+      );
+    }
+  );
 });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js	2019-09-15 11:33:09.000000000 +0000
@@ -2,6 +2,8 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 "use strict";
 
+requestLongerTimeout(2);
+
 declTest("getActor with mismatch", {
   matches: ["*://*/*"],
 
@@ -106,6 +108,34 @@
     });
   },
 });
+
+declTest("getActor with iframe remoteType match", {
+  allFrames: true,
+  remoteTypes: ["web"],
+
+  async test(browser) {
+    await ContentTask.spawn(browser, TEST_URL, async function(url) {
+      let child = content.getWindowGlobalChild();
+      ok(child, "WindowGlobalChild should have value.");
+      ok(child.getActor("Test"), "JSWindowActorChild should have value.");
+
+      // Create and append an iframe into the window's document.
+      let frame = content.document.createElement("iframe");
+      frame.src = url;
+      content.document.body.appendChild(frame);
+      await ContentTaskUtils.waitForEvent(frame, "load");
+
+      is(content.frames.length, 1, "There should be an iframe.");
+      await content.SpecialPowers.spawn(frame, [], () => {
+        child = content.getWindowGlobalChild();
+        Assert.ok(
+          child.getActor("Test"),
+          "JSWindowActorChild should have value."
+        );
+      });
+    });
+  },
+});
 
 declTest("getActor with remoteType mismatch", {
   remoteTypes: ["privilegedabout"],
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/l10n/DOMLocalization.h firefox-trunk-71.0~a1~hg20190915r493291/dom/l10n/DOMLocalization.h
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/l10n/DOMLocalization.h	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/l10n/DOMLocalization.h	2019-09-15 11:33:09.000000000 +0000
@@ -92,7 +92,7 @@
 
  protected:
   virtual ~DOMLocalization();
-  void OnChange();
+  void OnChange() override;
   void DisconnectMutations();
   void DisconnectRoots();
   void ReportL10nOverlaysErrors(nsTArray<L10nOverlaysError>& aErrors);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/localstorage/ActorsParent.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/localstorage/ActorsParent.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/localstorage/ActorsParent.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/localstorage/ActorsParent.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -7913,26 +7913,12 @@
       return rv;
     }
 
-    nsCString buffer;
-    rv = stmt->GetUTF8String(1, buffer);
+    LSValue value;
+    rv = value.InitFromStatement(stmt, 1);
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
 
-    int32_t utf16Length;
-    rv = stmt->GetInt32(2, &utf16Length);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    int32_t compressed;
-    rv = stmt->GetInt32(3, &compressed);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-
-    LSValue value(buffer, utf16Length, compressed);
-
     mPrepareDatastoreOp->mValues.Put(key, value);
     auto item = mPrepareDatastoreOp->mOrderedItems.AppendElement();
     item->key() = key;
@@ -8013,11 +7999,15 @@
   }
 
   nsCString compressed;
-  if (!SnappyCompress(value, compressed)) {
-    compressed = value;
+  if (NS_WARN_IF(!SnappyCompress(value, compressed))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (!compressed.IsVoid()) {
+    value = compressed;
   }
 
-  nsCOMPtr<nsIVariant> result = new storage::UTF8TextVariant(compressed);
+  nsCOMPtr<nsIVariant> result = new storage::UTF8TextVariant(value);
 
   result.forget(aResult);
   return NS_OK;
@@ -8051,7 +8041,11 @@
   }
 
   nsCString compressed;
-  bool compressible = SnappyCompress(value, compressed);
+  if (NS_WARN_IF(!SnappyCompress(value, compressed))) {
+    return NS_ERROR_FAILURE;
+  }
+
+  bool compressible = !compressed.IsVoid();
 
   nsCOMPtr<nsIVariant> result = new storage::IntegerVariant(compressible);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/localstorage/LSSnapshot.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/localstorage/LSSnapshot.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/localstorage/LSSnapshot.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/localstorage/LSSnapshot.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -24,7 +24,7 @@
  * observers for other content processes.)
  */
 class SnapshotWriteOptimizer final
-    : public LSWriteOptimizer<nsAString, nsString> {
+    : public LSWriteOptimizer<LSValue> {
  public:
   void Enumerate(nsTArray<LSWriteInfo>& aWriteInfos);
 };
@@ -46,7 +46,7 @@
 
         LSSetItemInfo setItemInfo;
         setItemInfo.key() = insertItemInfo->GetKey();
-        setItemInfo.value() = LSValue(insertItemInfo->GetValue());
+        setItemInfo.value() = insertItemInfo->GetValue();
 
         aWriteInfos.AppendElement(std::move(setItemInfo));
 
@@ -68,7 +68,7 @@
 
         LSSetItemInfo setItemInfo;
         setItemInfo.key() = updateItemInfo->GetKey();
-        setItemInfo.value() = LSValue(updateItemInfo->GetValue());
+        setItemInfo.value() = updateItemInfo->GetValue();
 
         aWriteInfos.AppendElement(std::move(setItemInfo));
 
@@ -312,6 +312,30 @@
   } else {
     changed = true;
 
+    auto autoRevertValue = MakeScopeExit([&] {
+      if (oldValue.IsVoid()) {
+        mValues.Remove(aKey);
+      } else {
+        mValues.Put(aKey, oldValue);
+      }
+    });
+
+    // Anything that can fail must be done early before we start modifying the
+    // state.
+
+    Maybe<LSValue> oldValueFromString;
+    if (mHasOtherProcessObservers) {
+      oldValueFromString.emplace();
+      if (NS_WARN_IF(!oldValueFromString->InitFromString(oldValue))) {
+        return NS_ERROR_FAILURE;
+      }
+    }
+
+    LSValue valueFromString;
+    if (NS_WARN_IF(!valueFromString.InitFromString(aValue))) {
+      return NS_ERROR_FAILURE;
+    }
+
     int64_t delta = static_cast<int64_t>(aValue.Length()) -
                     static_cast<int64_t>(oldValue.Length());
 
@@ -321,11 +345,6 @@
 
     rv = UpdateUsage(delta);
     if (NS_WARN_IF(NS_FAILED(rv))) {
-      if (oldValue.IsVoid()) {
-        mValues.Remove(aKey);
-      } else {
-        mValues.Put(aKey, oldValue);
-      }
       return rv;
     }
 
@@ -335,22 +354,25 @@
 
     if (mHasOtherProcessObservers) {
       MOZ_ASSERT(mWriteAndNotifyInfos);
+      MOZ_ASSERT(oldValueFromString.isSome());
 
       LSSetItemAndNotifyInfo setItemAndNotifyInfo;
       setItemAndNotifyInfo.key() = aKey;
-      setItemAndNotifyInfo.oldValue() = LSValue(oldValue);
-      setItemAndNotifyInfo.value() = LSValue(aValue);
+      setItemAndNotifyInfo.oldValue() = oldValueFromString.value();
+      setItemAndNotifyInfo.value() = valueFromString;
 
       mWriteAndNotifyInfos->AppendElement(std::move(setItemAndNotifyInfo));
     } else {
       MOZ_ASSERT(mWriteOptimizer);
 
       if (oldValue.IsVoid()) {
-        mWriteOptimizer->InsertItem(aKey, aValue);
+        mWriteOptimizer->InsertItem(aKey, valueFromString);
       } else {
-        mWriteOptimizer->UpdateItem(aKey, aValue);
+        mWriteOptimizer->UpdateItem(aKey, valueFromString);
       }
     }
+
+    autoRevertValue.release();
   }
 
   aNotifyInfo.changed() = changed;
@@ -381,6 +403,22 @@
   } else {
     changed = true;
 
+    auto autoRevertValue = MakeScopeExit([&] {
+      MOZ_ASSERT(!oldValue.IsVoid());
+      mValues.Put(aKey, oldValue);
+    });
+
+    // Anything that can fail must be done early before we start modifying the
+    // state.
+
+    Maybe<LSValue> oldValueFromString;
+    if (mHasOtherProcessObservers) {
+      oldValueFromString.emplace();
+      if (NS_WARN_IF(!oldValueFromString->InitFromString(oldValue))) {
+        return NS_ERROR_FAILURE;
+      }
+    }
+
     int64_t delta = -(static_cast<int64_t>(aKey.Length()) +
                       static_cast<int64_t>(oldValue.Length()));
 
@@ -393,10 +431,11 @@
 
     if (mHasOtherProcessObservers) {
       MOZ_ASSERT(mWriteAndNotifyInfos);
+      MOZ_ASSERT(oldValueFromString.isSome());
 
       LSRemoveItemAndNotifyInfo removeItemAndNotifyInfo;
       removeItemAndNotifyInfo.key() = aKey;
-      removeItemAndNotifyInfo.oldValue() = LSValue(oldValue);
+      removeItemAndNotifyInfo.oldValue() = oldValueFromString.value();
 
       mWriteAndNotifyInfos->AppendElement(std::move(removeItemAndNotifyInfo));
     } else {
@@ -404,6 +443,8 @@
 
       mWriteOptimizer->DeleteItem(aKey);
     }
+
+    autoRevertValue.release();
   }
 
   aNotifyInfo.changed() = changed;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/localstorage/LSValue.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/localstorage/LSValue.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/localstorage/LSValue.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/localstorage/LSValue.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -9,8 +9,71 @@
 namespace mozilla {
 namespace dom {
 
+bool LSValue::InitFromString(const nsAString& aBuffer) {
+  MOZ_ASSERT(mBuffer.IsVoid());
+  MOZ_ASSERT(!mUTF16Length);
+  MOZ_ASSERT(!mCompressed);
+
+  if (aBuffer.IsVoid()) {
+    return true;
+  }
+
+  nsCString converted;
+  if (NS_WARN_IF(!CopyUTF16toUTF8(aBuffer, converted, fallible))) {
+    return false;
+  }
+
+  nsCString convertedAndCompressed;
+  if (NS_WARN_IF(!SnappyCompress(converted, convertedAndCompressed))) {
+    return false;
+  }
+
+  if (convertedAndCompressed.IsVoid()) {
+    mBuffer = converted;
+    mUTF16Length = aBuffer.Length();
+  } else {
+    mBuffer = convertedAndCompressed;
+    mUTF16Length = aBuffer.Length();
+    mCompressed = true;
+  }
+
+  return true;
+}
+
+nsresult LSValue::InitFromStatement(mozIStorageStatement* aStatement,
+                                    uint32_t aIndex) {
+  MOZ_ASSERT(aStatement);
+  MOZ_ASSERT(mBuffer.IsVoid());
+  MOZ_ASSERT(!mUTF16Length);
+  MOZ_ASSERT(!mCompressed);
+
+  nsCString buffer;
+  nsresult rv = aStatement->GetUTF8String(aIndex, buffer);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  int32_t utf16Length;
+  rv = aStatement->GetInt32(aIndex + 1, &utf16Length);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  int32_t compressed;
+  rv = aStatement->GetInt32(aIndex + 2, &compressed);
+  if (NS_WARN_IF(NS_FAILED(rv))) {
+    return rv;
+  }
+
+  mBuffer = buffer;
+  mUTF16Length = utf16Length;
+  mCompressed = compressed;
+
+  return NS_OK;
+}
+
 const LSValue& VoidLSValue() {
-  static const LSValue sVoidLSValue(VoidCString(), 0, false);
+  static const LSValue sVoidLSValue;
 
   return sVoidLSValue;
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/localstorage/LSValue.h firefox-trunk-71.0~a1~hg20190915r493291/dom/localstorage/LSValue.h
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/localstorage/LSValue.h	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/localstorage/LSValue.h	2019-09-15 11:33:09.000000000 +0000
@@ -9,6 +9,8 @@
 
 #include "SnappyUtils.h"
 
+class mozIStorageStatement;
+
 namespace mozilla {
 namespace dom {
 
@@ -29,26 +31,11 @@
   bool mCompressed;
 
  public:
-  LSValue() : mUTF16Length(0), mCompressed(false) {}
+  LSValue() : mUTF16Length(0), mCompressed(false) { SetIsVoid(true); }
+
+  bool InitFromString(const nsAString& aBuffer);
 
-  explicit LSValue(const nsACString& aBuffer, uint32_t aUTF16Length,
-                   bool aCompressed)
-      : mBuffer(aBuffer),
-        mUTF16Length(aUTF16Length),
-        mCompressed(aCompressed) {}
-
-  explicit LSValue(const nsAString& aBuffer) : mUTF16Length(aBuffer.Length()) {
-    if (aBuffer.IsVoid()) {
-      mBuffer.SetIsVoid(true);
-      mCompressed = false;
-    } else {
-      CopyUTF16toUTF8(aBuffer, mBuffer);
-      nsCString buffer;
-      if ((mCompressed = SnappyCompress(mBuffer, buffer))) {
-        mBuffer = buffer;
-      }
-    }
-  }
+  nsresult InitFromStatement(mozIStorageStatement* aStatement, uint32_t aIndex);
 
   bool IsVoid() const { return mBuffer.IsVoid(); }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/localstorage/SnappyUtils.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/localstorage/SnappyUtils.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/localstorage/SnappyUtils.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/localstorage/SnappyUtils.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -17,21 +17,27 @@
   size_t uncompressedLength = aSource.Length();
 
   if (uncompressedLength <= 16) {
-    return false;
+    aDest.SetIsVoid(true);
+    return true;
   }
 
   size_t compressedLength = snappy::MaxCompressedLength(uncompressedLength);
 
-  aDest.SetLength(compressedLength);
+  if (NS_WARN_IF(!aDest.SetLength(compressedLength, fallible))) {
+    return false;
+  }
 
   snappy::RawCompress(aSource.BeginReading(), uncompressedLength,
                       aDest.BeginWriting(), &compressedLength);
 
   if (compressedLength >= uncompressedLength) {
-    return false;
+    aDest.SetIsVoid(true);
+    return true;
   }
 
-  aDest.SetLength(compressedLength);
+  if (NS_WARN_IF(!aDest.SetLength(compressedLength, fallible))) {
+    return false;
+  }
 
   return true;
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/MathMLElement.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/MathMLElement.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/MathMLElement.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/MathMLElement.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -0,0 +1,974 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/dom/MathMLElement.h"
+
+#include "base/compiler_specific.h"
+#include "mozilla/dom/BindContext.h"
+#include "mozilla/ArrayUtils.h"
+#include "mozilla/FontPropertyTypes.h"
+#include "mozilla/StaticPrefs_mathml.h"
+#include "mozilla/TextUtils.h"
+#include "nsGkAtoms.h"
+#include "nsITableCellLayout.h"  // for MAX_COLSPAN / MAX_ROWSPAN
+#include "nsLayoutStylesheetCache.h"
+#include "nsCSSValue.h"
+#include "nsMappedAttributes.h"
+#include "nsStyleConsts.h"
+#include "mozilla/dom/Document.h"
+#include "nsPresContext.h"
+#include "mozAutoDocUpdate.h"
+#include "nsIScriptError.h"
+#include "nsContentUtils.h"
+#include "nsIURI.h"
+
+#include "mozilla/EventDispatcher.h"
+#include "mozilla/EventStates.h"
+#include "mozilla/MappedDeclarations.h"
+#include "mozilla/dom/ElementBinding.h"
+
+using namespace mozilla;
+using namespace mozilla::dom;
+
+//----------------------------------------------------------------------
+// nsISupports methods:
+
+NS_IMPL_ISUPPORTS_INHERITED(MathMLElement, MathMLElementBase, Link)
+
+static nsresult WarnDeprecated(const char16_t* aDeprecatedAttribute,
+                               const char16_t* aFavoredAttribute,
+                               Document* aDocument) {
+  AutoTArray<nsString, 2> argv;
+  argv.AppendElement(aDeprecatedAttribute);
+  argv.AppendElement(aFavoredAttribute);
+  return nsContentUtils::ReportToConsole(
+      nsIScriptError::warningFlag, NS_LITERAL_CSTRING("MathML"), aDocument,
+      nsContentUtils::eMATHML_PROPERTIES, "DeprecatedSupersededBy", argv);
+}
+
+static nsresult ReportLengthParseError(const nsString& aValue,
+                                       Document* aDocument) {
+  AutoTArray<nsString, 1> arg = {aValue};
+  return nsContentUtils::ReportToConsole(
+      nsIScriptError::errorFlag, NS_LITERAL_CSTRING("MathML"), aDocument,
+      nsContentUtils::eMATHML_PROPERTIES, "LengthParsingError", arg);
+}
+
+static nsresult ReportParseErrorNoTag(const nsString& aValue, nsAtom* aAtom,
+                                      Document* aDocument) {
+  AutoTArray<nsString, 2> argv = {aValue, nsDependentAtomString(aAtom)};
+  return nsContentUtils::ReportToConsole(
+      nsIScriptError::errorFlag, NS_LITERAL_CSTRING("MathML"), aDocument,
+      nsContentUtils::eMATHML_PROPERTIES, "AttributeParsingErrorNoTag", argv);
+}
+
+MathMLElement::MathMLElement(
+    already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
+    : MathMLElementBase(std::move(aNodeInfo)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(Link(this)),
+      mIncrementScriptLevel(false) {}
+
+MathMLElement::MathMLElement(
+    already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo)
+    : MathMLElementBase(std::move(aNodeInfo)),
+      ALLOW_THIS_IN_INITIALIZER_LIST(Link(this)),
+      mIncrementScriptLevel(false) {}
+
+nsresult MathMLElement::BindToTree(BindContext& aContext, nsINode& aParent) {
+  Link::ResetLinkState(false, Link::ElementHasHref());
+
+  nsresult rv = MathMLElementBase::BindToTree(aContext, aParent);
+  NS_ENSURE_SUCCESS(rv, rv);
+
+  // FIXME(emilio): Probably should be composed, this uses all the other link
+  // infrastructure.
+  if (Document* doc = aContext.GetUncomposedDoc()) {
+    doc->RegisterPendingLinkUpdate(this);
+  }
+
+  // Set the bit in the document for telemetry.
+  if (Document* doc = aContext.GetComposedDoc()) {
+    doc->SetMathMLEnabled();
+  }
+
+  return rv;
+}
+
+void MathMLElement::UnbindFromTree(bool aNullParent) {
+  // Without removing the link state we risk a dangling pointer
+  // in the mStyledLinks hashtable
+  Link::ResetLinkState(false, Link::ElementHasHref());
+
+  MathMLElementBase::UnbindFromTree(aNullParent);
+}
+
+bool MathMLElement::ParseAttribute(int32_t aNamespaceID, nsAtom* aAttribute,
+                                   const nsAString& aValue,
+                                   nsIPrincipal* aMaybeScriptedPrincipal,
+                                   nsAttrValue& aResult) {
+  MOZ_ASSERT(IsMathMLElement());
+
+  if (aNamespaceID == kNameSpaceID_None) {
+    if (aAttribute == nsGkAtoms::color || aAttribute == nsGkAtoms::mathcolor_ ||
+        aAttribute == nsGkAtoms::background ||
+        aAttribute == nsGkAtoms::mathbackground_) {
+      return aResult.ParseColor(aValue);
+    }
+    if (mNodeInfo->Equals(nsGkAtoms::mtd_)) {
+      if (aAttribute == nsGkAtoms::columnspan_) {
+        aResult.ParseClampedNonNegativeInt(aValue, 1, 1, MAX_COLSPAN);
+        return true;
+      }
+      if (aAttribute == nsGkAtoms::rowspan) {
+        aResult.ParseClampedNonNegativeInt(aValue, 1, 0, MAX_ROWSPAN);
+        return true;
+      }
+    }
+  }
+
+  return MathMLElementBase::ParseAttribute(aNamespaceID, aAttribute, aValue,
+                                           aMaybeScriptedPrincipal, aResult);
+}
+
+// https://mathml-refresh.github.io/mathml-core/#global-attributes
+static Element::MappedAttributeEntry sGlobalAttributes[] = {
+    {nsGkAtoms::dir},
+    {nsGkAtoms::mathbackground_},
+    {nsGkAtoms::mathcolor_},
+    {nsGkAtoms::mathsize_},
+    {nsGkAtoms::mathvariant_},
+    {nsGkAtoms::scriptlevel_},
+    // XXXfredw: Also map displaystyle to CSS math-style?
+    {nullptr}};
+
+// XXXfredw(bug 1548471): Add a runtime flag to disable these attributes.
+static Element::MappedAttributeEntry sDeprecatedScriptAttributes[] = {
+    {nsGkAtoms::scriptminsize_}, {nsGkAtoms::scriptsizemultiplier_}, {nullptr}};
+
+static Element::MappedAttributeEntry sDeprecatedStyleAttributes[] = {
+    {nsGkAtoms::background},
+    {nsGkAtoms::color},
+    {nsGkAtoms::fontfamily_},
+    {nsGkAtoms::fontsize_},
+    {nsGkAtoms::fontstyle_},
+    {nsGkAtoms::fontweight_},
+    {nullptr}};
+
+bool MathMLElement::IsAttributeMapped(const nsAtom* aAttribute) const {
+  MOZ_ASSERT(IsMathMLElement());
+
+  static const MappedAttributeEntry* const globalMap[] = {
+      sGlobalAttributes, sDeprecatedScriptAttributes};
+  static const MappedAttributeEntry* const styleMap[] = {
+      sDeprecatedStyleAttributes};
+
+  return FindAttributeDependence(aAttribute, globalMap) ||
+         (!StaticPrefs::mathml_deprecated_style_attributes_disabled() &&
+          FindAttributeDependence(aAttribute, styleMap)) ||
+         (mNodeInfo->Equals(nsGkAtoms::mtable_) &&
+          aAttribute == nsGkAtoms::width);
+}
+
+nsMapRuleToAttributesFunc MathMLElement::GetAttributeMappingFunction() const {
+  // It doesn't really matter what our tag is here, because only attributes
+  // that satisfy IsAttributeMapped will be stored in the mapped attributes
+  // list and available to the mapping function
+  return &MapMathMLAttributesInto;
+}
+
+/* static */
+bool MathMLElement::ParseNamedSpaceValue(const nsString& aString,
+                                         nsCSSValue& aCSSValue, uint32_t aFlags,
+                                         const Document& aDocument) {
+  if (StaticPrefs::mathml_mathspace_names_disabled()) {
+    return false;
+  }
+  int32_t i = 0;
+  // See if it is one of the 'namedspace' (ranging -7/18em, -6/18, ... 7/18em)
+  if (aString.EqualsLiteral("veryverythinmathspace")) {
+    i = 1;
+  } else if (aString.EqualsLiteral("verythinmathspace")) {
+    i = 2;
+  } else if (aString.EqualsLiteral("thinmathspace")) {
+    i = 3;
+  } else if (aString.EqualsLiteral("mediummathspace")) {
+    i = 4;
+  } else if (aString.EqualsLiteral("thickmathspace")) {
+    i = 5;
+  } else if (aString.EqualsLiteral("verythickmathspace")) {
+    i = 6;
+  } else if (aString.EqualsLiteral("veryverythickmathspace")) {
+    i = 7;
+  } else if (aFlags & PARSE_ALLOW_NEGATIVE) {
+    if (aString.EqualsLiteral("negativeveryverythinmathspace")) {
+      i = -1;
+    } else if (aString.EqualsLiteral("negativeverythinmathspace")) {
+      i = -2;
+    } else if (aString.EqualsLiteral("negativethinmathspace")) {
+      i = -3;
+    } else if (aString.EqualsLiteral("negativemediummathspace")) {
+      i = -4;
+    } else if (aString.EqualsLiteral("negativethickmathspace")) {
+      i = -5;
+    } else if (aString.EqualsLiteral("negativeverythickmathspace")) {
+      i = -6;
+    } else if (aString.EqualsLiteral("negativeveryverythickmathspace")) {
+      i = -7;
+    }
+  }
+  if (0 != i) {
+    aDocument.WarnOnceAbout(dom::Document::eMathML_DeprecatedMathSpaceValue);
+    aCSSValue.SetFloatValue(float(i) / float(18), eCSSUnit_EM);
+    return true;
+  }
+
+  return false;
+}
+
+// The REC says:
+//
+// "Most presentation elements have attributes that accept values representing
+// lengths to be used for size, spacing or similar properties. The syntax of a
+// length is specified as
+//
+// number | number unit | namedspace
+//
+// There should be no space between the number and the unit of a length."
+//
+// "A trailing '%' represents a percent of the default value. The default
+// value, or how it is obtained, is listed in the table of attributes for each
+// element. [...] A number without a unit is intepreted as a multiple of the
+// default value."
+//
+// "The possible units in MathML are:
+//
+// Unit Description
+// em   an em (font-relative unit traditionally used for horizontal lengths)
+// ex   an ex (font-relative unit traditionally used for vertical lengths)
+// px   pixels, or size of a pixel in the current display
+// in   inches (1 inch = 2.54 centimeters)
+// cm   centimeters
+// mm   millimeters
+// pt   points (1 point = 1/72 inch)
+// pc   picas (1 pica = 12 points)
+// %    percentage of default value"
+//
+// The numbers are defined that way:
+// - unsigned-number: "a string of decimal digits with up to one decimal point
+//   (U+002E), representing a non-negative terminating decimal number (a type of
+//   rational number)"
+// - number: "an optional prefix of '-' (U+002D), followed by an unsigned
+//   number, representing a terminating decimal number (a type of rational
+//   number)"
+//
+/* static */
+// XXXfredw: Deprecate legacy MathML syntax and use the CSS parser instead.
+// See https://github.com/mathml-refresh/mathml/issues/63
+bool MathMLElement::ParseNumericValue(const nsString& aString,
+                                      nsCSSValue& aCSSValue, uint32_t aFlags,
+                                      Document* aDocument) {
+  nsAutoString str(aString);
+  str.CompressWhitespace();  // aString is const in this code...
+
+  int32_t stringLength = str.Length();
+  if (!stringLength) {
+    if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
+      ReportLengthParseError(aString, aDocument);
+    }
+    return false;
+  }
+
+  if (aDocument && ParseNamedSpaceValue(str, aCSSValue, aFlags, *aDocument)) {
+    return true;
+  }
+
+  nsAutoString number, unit;
+
+  // see if the negative sign is there
+  int32_t i = 0;
+  char16_t c = str[0];
+  if (c == '-') {
+    number.Append(c);
+    i++;
+  }
+
+  // Gather up characters that make up the number
+  bool gotDot = false;
+  for (; i < stringLength; i++) {
+    c = str[i];
+    if (gotDot && c == '.') {
+      if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
+        ReportLengthParseError(aString, aDocument);
+      }
+      return false;  // two dots encountered
+    } else if (c == '.')
+      gotDot = true;
+    else if (!IsAsciiDigit(c)) {
+      str.Right(unit, stringLength - i);
+      // some authors leave blanks before the unit, but that shouldn't
+      // be allowed, so don't CompressWhitespace on 'unit'.
+      break;
+    }
+    number.Append(c);
+  }
+  if (StaticPrefs::mathml_legacy_number_syntax_disabled() &&
+      gotDot && str[i - 1] == '.') {
+    if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
+      ReportLengthParseError(aString, aDocument);
+    }
+    return false; // Number ending with a dot.
+  }
+
+  // Convert number to floating point
+  nsresult errorCode;
+  float floatValue = number.ToFloat(&errorCode);
+  if (NS_FAILED(errorCode)) {
+    if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
+      ReportLengthParseError(aString, aDocument);
+    }
+    return false;
+  }
+  if (floatValue < 0 && !(aFlags & PARSE_ALLOW_NEGATIVE)) {
+    if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
+      ReportLengthParseError(aString, aDocument);
+    }
+    return false;
+  }
+
+  nsCSSUnit cssUnit;
+  if (unit.IsEmpty()) {
+    if (!StaticPrefs::mathml_nonzero_unitless_lengths_disabled() &&
+        (aFlags & PARSE_ALLOW_UNITLESS)) {
+      // no explicit unit, this is a number that will act as a multiplier
+      if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
+        nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
+                                        NS_LITERAL_CSTRING("MathML"), aDocument,
+                                        nsContentUtils::eMATHML_PROPERTIES,
+                                        "UnitlessValuesAreDeprecated");
+      }
+      if (aFlags & CONVERT_UNITLESS_TO_PERCENT) {
+        aCSSValue.SetPercentValue(floatValue);
+        return true;
+      } else
+        cssUnit = eCSSUnit_Number;
+    } else {
+      // We are supposed to have a unit, but there isn't one.
+      // If the value is 0 we can just call it "pixels" otherwise
+      // this is illegal.
+      if (floatValue != 0.0) {
+        if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
+          ReportLengthParseError(aString, aDocument);
+        }
+        return false;
+      }
+      cssUnit = eCSSUnit_Pixel;
+    }
+  } else if (unit.EqualsLiteral("%")) {
+    aCSSValue.SetPercentValue(floatValue / 100.0f);
+    return true;
+  } else if (unit.LowerCaseEqualsLiteral("em"))
+    cssUnit = eCSSUnit_EM;
+  else if (unit.LowerCaseEqualsLiteral("ex"))
+    cssUnit = eCSSUnit_XHeight;
+  else if (unit.LowerCaseEqualsLiteral("px"))
+    cssUnit = eCSSUnit_Pixel;
+  else if (unit.LowerCaseEqualsLiteral("in"))
+    cssUnit = eCSSUnit_Inch;
+  else if (unit.LowerCaseEqualsLiteral("cm"))
+    cssUnit = eCSSUnit_Centimeter;
+  else if (unit.LowerCaseEqualsLiteral("mm"))
+    cssUnit = eCSSUnit_Millimeter;
+  else if (unit.LowerCaseEqualsLiteral("pt"))
+    cssUnit = eCSSUnit_Point;
+  else if (unit.LowerCaseEqualsLiteral("pc"))
+    cssUnit = eCSSUnit_Pica;
+  else if (unit.LowerCaseEqualsLiteral("q"))
+    cssUnit = eCSSUnit_Quarter;
+  else {  // unexpected unit
+    if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
+      ReportLengthParseError(aString, aDocument);
+    }
+    return false;
+  }
+
+  aCSSValue.SetFloatValue(floatValue, cssUnit);
+  return true;
+}
+
+void MathMLElement::MapMathMLAttributesInto(
+    const nsMappedAttributes* aAttributes, MappedDeclarations& aDecls) {
+  // scriptsizemultiplier
+  //
+  // "Specifies the multiplier to be used to adjust font size due to changes
+  // in scriptlevel.
+  //
+  // values: number
+  // default: 0.71
+  //
+  const nsAttrValue* value =
+      aAttributes->GetAttr(nsGkAtoms::scriptsizemultiplier_);
+  if (value && value->Type() == nsAttrValue::eString &&
+      !aDecls.PropertyIsSet(eCSSProperty__moz_script_size_multiplier)) {
+    nsAutoString str(value->GetStringValue());
+    str.CompressWhitespace();
+    // MathML numbers can't have leading '+'
+    if (str.Length() > 0 && str.CharAt(0) != '+') {
+      nsresult errorCode;
+      float floatValue = str.ToFloat(&errorCode);
+      // Negative scriptsizemultipliers are not parsed
+      if (NS_SUCCEEDED(errorCode) && floatValue >= 0.0f) {
+        aDecls.SetNumberValue(eCSSProperty__moz_script_size_multiplier,
+                              floatValue);
+      } else {
+        ReportParseErrorNoTag(str, nsGkAtoms::scriptsizemultiplier_,
+                              aDecls.Document());
+      }
+    }
+  }
+
+  // scriptminsize
+  //
+  // "Specifies the minimum font size allowed due to changes in scriptlevel.
+  // Note that this does not limit the font size due to changes to mathsize."
+  //
+  // values: length
+  // default: 8pt
+  //
+  // We don't allow negative values.
+  // Unitless and percent values give a multiple of the default value.
+  //
+  value = aAttributes->GetAttr(nsGkAtoms::scriptminsize_);
+  if (value && value->Type() == nsAttrValue::eString &&
+      !aDecls.PropertyIsSet(eCSSProperty__moz_script_min_size)) {
+    nsCSSValue scriptMinSize;
+    ParseNumericValue(value->GetStringValue(), scriptMinSize,
+                      PARSE_ALLOW_UNITLESS | CONVERT_UNITLESS_TO_PERCENT,
+                      aDecls.Document());
+
+    if (scriptMinSize.GetUnit() == eCSSUnit_Percent) {
+      scriptMinSize.SetFloatValue(8.0 * scriptMinSize.GetPercentValue(),
+                                  eCSSUnit_Point);
+    }
+    if (scriptMinSize.GetUnit() != eCSSUnit_Null) {
+      aDecls.SetLengthValue(eCSSProperty__moz_script_min_size, scriptMinSize);
+    }
+  }
+
+  // scriptlevel
+  //
+  // "Changes the scriptlevel in effect for the children. When the value is
+  // given without a sign, it sets scriptlevel to the specified value; when a
+  // sign is given, it increments ("+") or decrements ("-") the current
+  // value. (Note that large decrements can result in negative values of
+  // scriptlevel, but these values are considered legal.)"
+  //
+  // values: ( "+" | "-" )? unsigned-integer
+  // default: inherited
+  //
+  value = aAttributes->GetAttr(nsGkAtoms::scriptlevel_);
+  if (value && value->Type() == nsAttrValue::eString &&
+      !aDecls.PropertyIsSet(eCSSProperty__moz_script_level)) {
+    nsAutoString str(value->GetStringValue());
+    str.CompressWhitespace();
+    if (str.Length() > 0) {
+      nsresult errorCode;
+      int32_t intValue = str.ToInteger(&errorCode);
+      if (NS_SUCCEEDED(errorCode)) {
+        // This is kind of cheesy ... if the scriptlevel has a sign,
+        // then it's a relative value and we store the nsCSSValue as an
+        // Integer to indicate that. Otherwise we store it as a Number
+        // to indicate that the scriptlevel is absolute.
+        char16_t ch = str.CharAt(0);
+        if (ch == '+' || ch == '-') {
+          aDecls.SetIntValue(eCSSProperty__moz_script_level, intValue);
+        } else {
+          aDecls.SetNumberValue(eCSSProperty__moz_script_level, intValue);
+        }
+      } else {
+        ReportParseErrorNoTag(str, nsGkAtoms::scriptlevel_, aDecls.Document());
+      }
+    }
+  }
+
+  // mathsize
+  //
+  // "Specifies the size to display the token content. The values 'small' and
+  // 'big' choose a size smaller or larger than the current font size, but
+  // leave the exact proportions unspecified; 'normal' is allowed for
+  // completeness, but since it is equivalent to '100%' or '1em', it has no
+  // effect."
+  //
+  // values: "small" | "normal" | "big" | length
+  // default: inherited
+  //
+  // fontsize
+  //
+  // "Specified the size for the token. Deprecated in favor of mathsize."
+  //
+  // values: length
+  // default: inherited
+  //
+  // In both cases, we don't allow negative values.
+  // Unitless values give a multiple of the default value.
+  //
+  bool parseSizeKeywords = !StaticPrefs::mathml_mathsize_names_disabled();
+  value = aAttributes->GetAttr(nsGkAtoms::mathsize_);
+  if (!value) {
+    parseSizeKeywords = false;
+    value = aAttributes->GetAttr(nsGkAtoms::fontsize_);
+    if (value) {
+      aDecls.Document()->WarnOnceAbout(
+          dom::Document::eMathML_DeprecatedStyleAttribute);
+    }
+  }
+  if (value && value->Type() == nsAttrValue::eString &&
+      !aDecls.PropertyIsSet(eCSSProperty_font_size)) {
+    nsAutoString str(value->GetStringValue());
+    nsCSSValue fontSize;
+    uint32_t flags = PARSE_ALLOW_UNITLESS | CONVERT_UNITLESS_TO_PERCENT;
+    if (parseSizeKeywords) {
+      // Do not warn for invalid value if mathsize keywords are accepted.
+      flags |= PARSE_SUPPRESS_WARNINGS;
+    }
+    if (!ParseNumericValue(str, fontSize, flags, nullptr) &&
+        parseSizeKeywords) {
+      static const char sizes[3][7] = {"small", "normal", "big"};
+      static const int32_t values[MOZ_ARRAY_LENGTH(sizes)] = {
+          NS_STYLE_FONT_SIZE_SMALL, NS_STYLE_FONT_SIZE_MEDIUM,
+          NS_STYLE_FONT_SIZE_LARGE};
+      str.CompressWhitespace();
+      for (uint32_t i = 0; i < ArrayLength(sizes); ++i) {
+        if (str.EqualsASCII(sizes[i])) {
+          aDecls.Document()->WarnOnceAbout(
+              dom::Document::eMathML_DeprecatedMathSizeValue);
+          aDecls.SetKeywordValue(eCSSProperty_font_size, values[i]);
+          break;
+        }
+      }
+    } else if (fontSize.GetUnit() == eCSSUnit_Percent) {
+      aDecls.SetPercentValue(eCSSProperty_font_size,
+                             fontSize.GetPercentValue());
+    } else if (fontSize.GetUnit() != eCSSUnit_Null) {
+      aDecls.SetLengthValue(eCSSProperty_font_size, fontSize);
+    }
+  }
+
+  // fontfamily
+  //
+  // "Should be the name of a font that may be available to a MathML renderer,
+  // or a CSS font specification; See Section 6.5 Using CSS with MathML and
+  // CSS for more information. Deprecated in favor of mathvariant."
+  //
+  // values: string
+  //
+  value = aAttributes->GetAttr(nsGkAtoms::fontfamily_);
+  if (value) {
+    aDecls.Document()->WarnOnceAbout(
+        dom::Document::eMathML_DeprecatedStyleAttribute);
+  }
+  if (value && value->Type() == nsAttrValue::eString &&
+      !aDecls.PropertyIsSet(eCSSProperty_font_family)) {
+    aDecls.SetFontFamily(value->GetStringValue());
+  }
+
+  // fontstyle
+  //
+  // "Specified the font style to use for the token. Deprecated in favor of
+  //  mathvariant."
+  //
+  // values: "normal" | "italic"
+  // default:	normal (except on <mi>)
+  //
+  // Note that the font-style property is reset in layout/style/ when
+  // -moz-math-variant is specified.
+  value = aAttributes->GetAttr(nsGkAtoms::fontstyle_);
+  if (value) {
+    aDecls.Document()->WarnOnceAbout(
+        dom::Document::eMathML_DeprecatedStyleAttribute);
+    if (value->Type() == nsAttrValue::eString &&
+        !aDecls.PropertyIsSet(eCSSProperty_font_style)) {
+      nsAutoString str(value->GetStringValue());
+      str.CompressWhitespace();
+      // FIXME(emilio): This should use FontSlantStyle or what not. Or even
+      // better, it looks deprecated since forever, we should just kill it.
+      if (str.EqualsASCII("normal")) {
+        aDecls.SetKeywordValue(eCSSProperty_font_style, NS_FONT_STYLE_NORMAL);
+      } else if (str.EqualsASCII("italic")) {
+        aDecls.SetKeywordValue(eCSSProperty_font_style, NS_FONT_STYLE_ITALIC);
+      }
+    }
+  }
+
+  // fontweight
+  //
+  // "Specified the font weight for the token. Deprecated in favor of
+  // mathvariant."
+  //
+  // values: "normal" | "bold"
+  // default: normal
+  //
+  // Note that the font-weight property is reset in layout/style/ when
+  // -moz-math-variant is specified.
+  value = aAttributes->GetAttr(nsGkAtoms::fontweight_);
+  if (value) {
+    aDecls.Document()->WarnOnceAbout(
+        dom::Document::eMathML_DeprecatedStyleAttribute);
+    if (value->Type() == nsAttrValue::eString &&
+        !aDecls.PropertyIsSet(eCSSProperty_font_weight)) {
+      nsAutoString str(value->GetStringValue());
+      str.CompressWhitespace();
+      if (str.EqualsASCII("normal")) {
+        aDecls.SetKeywordValue(eCSSProperty_font_weight,
+                               FontWeight::Normal().ToFloat());
+      } else if (str.EqualsASCII("bold")) {
+        aDecls.SetKeywordValue(eCSSProperty_font_weight,
+                               FontWeight::Bold().ToFloat());
+      }
+    }
+  }
+
+  // mathvariant
+  //
+  // "Specifies the logical class of the token. Note that this class is more
+  // than styling, it typically conveys semantic intent;"
+  //
+  // values: "normal" | "bold" | "italic" | "bold-italic" | "double-struck" |
+  // "bold-fraktur" | "script" | "bold-script" | "fraktur" | "sans-serif" |
+  // "bold-sans-serif" | "sans-serif-italic" | "sans-serif-bold-italic" |
+  // "monospace" | "initial" | "tailed" | "looped" | "stretched"
+  // default: normal (except on <mi>)
+  //
+  value = aAttributes->GetAttr(nsGkAtoms::mathvariant_);
+  if (value && value->Type() == nsAttrValue::eString &&
+      !aDecls.PropertyIsSet(eCSSProperty__moz_math_variant)) {
+    nsAutoString str(value->GetStringValue());
+    str.CompressWhitespace();
+    static const char sizes[19][23] = {"normal",
+                                       "bold",
+                                       "italic",
+                                       "bold-italic",
+                                       "script",
+                                       "bold-script",
+                                       "fraktur",
+                                       "double-struck",
+                                       "bold-fraktur",
+                                       "sans-serif",
+                                       "bold-sans-serif",
+                                       "sans-serif-italic",
+                                       "sans-serif-bold-italic",
+                                       "monospace",
+                                       "initial",
+                                       "tailed",
+                                       "looped",
+                                       "stretched"};
+    static const int32_t values[MOZ_ARRAY_LENGTH(sizes)] = {
+        NS_MATHML_MATHVARIANT_NORMAL,
+        NS_MATHML_MATHVARIANT_BOLD,
+        NS_MATHML_MATHVARIANT_ITALIC,
+        NS_MATHML_MATHVARIANT_BOLD_ITALIC,
+        NS_MATHML_MATHVARIANT_SCRIPT,
+        NS_MATHML_MATHVARIANT_BOLD_SCRIPT,
+        NS_MATHML_MATHVARIANT_FRAKTUR,
+        NS_MATHML_MATHVARIANT_DOUBLE_STRUCK,
+        NS_MATHML_MATHVARIANT_BOLD_FRAKTUR,
+        NS_MATHML_MATHVARIANT_SANS_SERIF,
+        NS_MATHML_MATHVARIANT_BOLD_SANS_SERIF,
+        NS_MATHML_MATHVARIANT_SANS_SERIF_ITALIC,
+        NS_MATHML_MATHVARIANT_SANS_SERIF_BOLD_ITALIC,
+        NS_MATHML_MATHVARIANT_MONOSPACE,
+        NS_MATHML_MATHVARIANT_INITIAL,
+        NS_MATHML_MATHVARIANT_TAILED,
+        NS_MATHML_MATHVARIANT_LOOPED,
+        NS_MATHML_MATHVARIANT_STRETCHED};
+    for (uint32_t i = 0; i < ArrayLength(sizes); ++i) {
+      if (str.LowerCaseEqualsASCII(sizes[i])) {
+        aDecls.SetKeywordValue(eCSSProperty__moz_math_variant, values[i]);
+        break;
+      }
+    }
+  }
+
+  // mathbackground
+  //
+  // "Specifies the background color to be used to fill in the bounding box of
+  // the element and its children. The default, 'transparent', lets the
+  // background color, if any, used in the current rendering context to show
+  // through."
+  //
+  // values: color | "transparent"
+  // default: "transparent"
+  //
+  // background
+  //
+  // "Specified the background color to be used to fill in the bounding box of
+  // the element and its children. Deprecated in favor of mathbackground."
+  //
+  // values: color | "transparent"
+  // default: "transparent"
+  //
+  value = aAttributes->GetAttr(nsGkAtoms::mathbackground_);
+  if (!value) {
+    value = aAttributes->GetAttr(nsGkAtoms::background);
+    if (value) {
+      aDecls.Document()->WarnOnceAbout(
+          dom::Document::eMathML_DeprecatedStyleAttribute);
+    }
+  }
+  if (value) {
+    nscolor color;
+    if (value->GetColorValue(color)) {
+      aDecls.SetColorValueIfUnset(eCSSProperty_background_color, color);
+    }
+  }
+
+  // mathcolor
+  //
+  // "Specifies the foreground color to use when drawing the components of this
+  // element, such as the content for token elements or any lines, surds, or
+  // other decorations. It also establishes the default mathcolor used for
+  // child elements when used on a layout element."
+  //
+  // values: color
+  // default: inherited
+  //
+  // color
+  //
+  // "Specified the color for the token. Deprecated in favor of mathcolor."
+  //
+  // values: color
+  // default: inherited
+  //
+  value = aAttributes->GetAttr(nsGkAtoms::mathcolor_);
+  if (!value) {
+    value = aAttributes->GetAttr(nsGkAtoms::color);
+    if (value) {
+      aDecls.Document()->WarnOnceAbout(
+          dom::Document::eMathML_DeprecatedStyleAttribute);
+    }
+  }
+  nscolor color;
+  if (value && value->GetColorValue(color)) {
+    aDecls.SetColorValueIfUnset(eCSSProperty_color, color);
+  }
+
+  // width
+  //
+  // "Specifies the desired width of the entire table and is intended for
+  // visual user agents. When the value is a percentage value, the value is
+  // relative to the horizontal space a MathML renderer has available for the
+  // math element. When the value is "auto", the MathML renderer should
+  // calculate the table width from its contents using whatever layout
+  // algorithm it chooses. "
+  //
+  // values: "auto" | length
+  // default: auto
+  //
+  if (!aDecls.PropertyIsSet(eCSSProperty_width)) {
+    const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::width);
+    nsCSSValue width;
+    // This does not handle auto and unitless values
+    if (value && value->Type() == nsAttrValue::eString) {
+      ParseNumericValue(value->GetStringValue(), width, 0, aDecls.Document());
+      if (width.GetUnit() == eCSSUnit_Percent) {
+        aDecls.SetPercentValue(eCSSProperty_width, width.GetPercentValue());
+      } else if (width.GetUnit() != eCSSUnit_Null) {
+        aDecls.SetLengthValue(eCSSProperty_width, width);
+      }
+    }
+  }
+
+  // dir
+  //
+  // Overall Directionality of Mathematics Formulas:
+  // "The overall directionality for a formula, basically the direction of the
+  // Layout Schemata, is specified by the dir attribute on the containing math
+  // element (see Section 2.2 The Top-Level math Element). The default is ltr.
+  // [...] The overall directionality is usually set on the math, but may also
+  // be switched for individual subformula by using the dir attribute on mrow
+  // or mstyle elements."
+  //
+  // Bidirectional Layout in Token Elements:
+  // "Specifies the initial directionality for text within the token:
+  // ltr (Left To Right) or rtl (Right To Left). This attribute should only be
+  // needed in rare cases involving weak or neutral characters;
+  // see Section 3.1.5.1 Overall Directionality of Mathematics Formulas for
+  // further discussion. It has no effect on mspace."
+  //
+  // values: "ltr" | "rtl"
+  // default: inherited
+  //
+  value = aAttributes->GetAttr(nsGkAtoms::dir);
+  if (value && value->Type() == nsAttrValue::eString &&
+      !aDecls.PropertyIsSet(eCSSProperty_direction)) {
+    nsAutoString str(value->GetStringValue());
+    static const char dirs[][4] = {"ltr", "rtl"};
+    static const int32_t dirValues[MOZ_ARRAY_LENGTH(dirs)] = {
+        NS_STYLE_DIRECTION_LTR, NS_STYLE_DIRECTION_RTL};
+    for (uint32_t i = 0; i < ArrayLength(dirs); ++i) {
+      if (str.LowerCaseEqualsASCII(dirs[i])) {
+        aDecls.SetKeywordValue(eCSSProperty_direction, dirValues[i]);
+        break;
+      }
+    }
+  }
+}
+
+void MathMLElement::GetEventTargetParent(EventChainPreVisitor& aVisitor) {
+  Element::GetEventTargetParent(aVisitor);
+
+  GetEventTargetParentForLinks(aVisitor);
+}
+
+nsresult MathMLElement::PostHandleEvent(EventChainPostVisitor& aVisitor) {
+  return PostHandleEventForLinks(aVisitor);
+}
+
+NS_IMPL_ELEMENT_CLONE(MathMLElement)
+
+EventStates MathMLElement::IntrinsicState() const {
+  return Link::LinkState() | MathMLElementBase::IntrinsicState() |
+         (mIncrementScriptLevel ? NS_EVENT_STATE_INCREMENT_SCRIPT_LEVEL
+                                : EventStates());
+}
+
+bool MathMLElement::IsNodeOfType(uint32_t aFlags) const { return false; }
+
+void MathMLElement::SetIncrementScriptLevel(bool aIncrementScriptLevel,
+                                            bool aNotify) {
+  if (aIncrementScriptLevel == mIncrementScriptLevel) return;
+  mIncrementScriptLevel = aIncrementScriptLevel;
+
+  NS_ASSERTION(aNotify, "We always notify!");
+
+  UpdateState(true);
+}
+
+bool MathMLElement::IsFocusableInternal(int32_t* aTabIndex, bool aWithMouse) {
+  nsCOMPtr<nsIURI> uri;
+  if (IsLink(getter_AddRefs(uri))) {
+    if (aTabIndex) {
+      *aTabIndex = ((sTabFocusModel & eTabFocus_linksMask) == 0 ? -1 : 0);
+    }
+    return true;
+  }
+
+  if (aTabIndex) {
+    *aTabIndex = -1;
+  }
+
+  return false;
+}
+
+bool MathMLElement::IsLink(nsIURI** aURI) const {
+  bool hasHref = false;
+  const nsAttrValue* href = mAttrs.GetAttr(nsGkAtoms::href, kNameSpaceID_None);
+  if (href) {
+    // MathML href
+    // The REC says: "When user agents encounter MathML elements with both href
+    // and xlink:href attributes, the href attribute should take precedence."
+    hasHref = true;
+  } else {
+    // To be a clickable XLink for styling and interaction purposes, we require:
+    //
+    //   xlink:href    - must be set
+    //   xlink:type    - must be unset or set to "" or set to "simple"
+    //   xlink:show    - must be unset or set to "", "new" or "replace"
+    //   xlink:actuate - must be unset or set to "" or "onRequest"
+    //
+    // For any other values, we're either not a *clickable* XLink, or the end
+    // result is poorly specified. Either way, we return false.
+
+    static Element::AttrValuesArray sTypeVals[] = {nsGkAtoms::_empty,
+                                                   nsGkAtoms::simple, nullptr};
+
+    static Element::AttrValuesArray sShowVals[] = {
+        nsGkAtoms::_empty, nsGkAtoms::_new, nsGkAtoms::replace, nullptr};
+
+    static Element::AttrValuesArray sActuateVals[] = {
+        nsGkAtoms::_empty, nsGkAtoms::onRequest, nullptr};
+
+    // Optimization: check for href first for early return
+    href = mAttrs.GetAttr(nsGkAtoms::href, kNameSpaceID_XLink);
+    if (href &&
+        FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::type, sTypeVals,
+                        eCaseMatters) != Element::ATTR_VALUE_NO_MATCH &&
+        FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::show, sShowVals,
+                        eCaseMatters) != Element::ATTR_VALUE_NO_MATCH &&
+        FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::actuate, sActuateVals,
+                        eCaseMatters) != Element::ATTR_VALUE_NO_MATCH) {
+      hasHref = true;
+    }
+  }
+
+  if (hasHref) {
+    // Get absolute URI
+    nsAutoString hrefStr;
+    href->ToString(hrefStr);
+    nsContentUtils::NewURIWithDocumentCharset(aURI, hrefStr, OwnerDoc(),
+                                              GetBaseURI());
+    // must promise out param is non-null if we return true
+    return !!*aURI;
+  }
+
+  *aURI = nullptr;
+  return false;
+}
+
+void MathMLElement::GetLinkTarget(nsAString& aTarget) {
+  const nsAttrValue* target =
+      mAttrs.GetAttr(nsGkAtoms::target, kNameSpaceID_XLink);
+  if (target) {
+    target->ToString(aTarget);
+  }
+
+  if (aTarget.IsEmpty()) {
+    static Element::AttrValuesArray sShowVals[] = {nsGkAtoms::_new,
+                                                   nsGkAtoms::replace, nullptr};
+
+    switch (FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::show, sShowVals,
+                            eCaseMatters)) {
+      case 0:
+        aTarget.AssignLiteral("_blank");
+        return;
+      case 1:
+        return;
+    }
+    OwnerDoc()->GetBaseTarget(aTarget);
+  }
+}
+
+already_AddRefed<nsIURI> MathMLElement::GetHrefURI() const {
+  nsCOMPtr<nsIURI> hrefURI;
+  return IsLink(getter_AddRefs(hrefURI)) ? hrefURI.forget() : nullptr;
+}
+
+nsresult MathMLElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
+                                     const nsAttrValue* aValue,
+                                     const nsAttrValue* aOldValue,
+                                     nsIPrincipal* aSubjectPrincipal,
+                                     bool aNotify) {
+  // It is important that this be done after the attribute is set/unset.
+  // We will need the updated attribute value because notifying the document
+  // that content states have changed will call IntrinsicState, which will try
+  // to get updated information about the visitedness from Link.
+  if (aName == nsGkAtoms::href && (aNameSpaceID == kNameSpaceID_None ||
+                                   aNameSpaceID == kNameSpaceID_XLink)) {
+    if (aValue && aNameSpaceID == kNameSpaceID_XLink) {
+      WarnDeprecated(u"xlink:href", u"href", OwnerDoc());
+    }
+    // Note: When unsetting href, there may still be another href since there
+    // are 2 possible namespaces.
+    Link::ResetLinkState(aNotify, aValue || Link::ElementHasHref());
+  }
+
+  return MathMLElementBase::AfterSetAttr(aNameSpaceID, aName, aValue, aOldValue,
+                                         aSubjectPrincipal, aNotify);
+}
+
+JSObject* MathMLElement::WrapNode(JSContext* aCx,
+                                  JS::Handle<JSObject*> aGivenProto) {
+  return Element_Binding::Wrap(aCx, this, aGivenProto);
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/MathMLElementFactory.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/MathMLElementFactory.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/MathMLElementFactory.cpp	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/MathMLElementFactory.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -0,0 +1,18 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsContentCreatorFunctions.h"
+#include "nsGkAtoms.h"
+#include "mozilla/dom/MathMLElement.h"
+
+using namespace mozilla::dom;
+
+// MathML Element Factory (declared in nsContentCreatorFunctions.h)
+nsresult NS_NewMathMLElement(
+    Element** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo) {
+  NS_ADDREF(*aResult = new MathMLElement(aNodeInfo));
+  return NS_OK;
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/MathMLElement.h firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/MathMLElement.h
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/MathMLElement.h	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/MathMLElement.h	2019-09-15 11:33:09.000000000 +0000
@@ -0,0 +1,107 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_MathMLElement_h_
+#define mozilla_dom_MathMLElement_h_
+
+#include "mozilla/Attributes.h"
+#include "mozilla/dom/Element.h"
+#include "nsMappedAttributeElement.h"
+#include "Link.h"
+#include "mozilla/dom/DOMRect.h"
+
+class nsCSSValue;
+
+namespace mozilla {
+class EventChainPostVisitor;
+class EventChainPreVisitor;
+namespace dom {
+
+typedef nsMappedAttributeElement MathMLElementBase;
+
+/*
+ * The base class for MathML elements.
+ */
+class MathMLElement final : public MathMLElementBase,
+                            public mozilla::dom::Link {
+ public:
+  explicit MathMLElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
+  explicit MathMLElement(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
+
+  // Implementation of nsISupports is inherited from MathMLElementBase
+  NS_DECL_ISUPPORTS_INHERITED
+
+  nsresult BindToTree(BindContext&, nsINode& aParent) override;
+  virtual void UnbindFromTree(bool aNullParent = true) override;
+
+  virtual bool ParseAttribute(int32_t aNamespaceID, nsAtom* aAttribute,
+                              const nsAString& aValue,
+                              nsIPrincipal* aMaybeScriptedPrincipal,
+                              nsAttrValue& aResult) override;
+
+  NS_IMETHOD_(bool) IsAttributeMapped(const nsAtom* aAttribute) const override;
+  virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction()
+      const override;
+
+  enum {
+    PARSE_ALLOW_UNITLESS = 0x01,  // unitless 0 will be turned into 0px
+    PARSE_ALLOW_NEGATIVE = 0x02,
+    PARSE_SUPPRESS_WARNINGS = 0x04,
+    CONVERT_UNITLESS_TO_PERCENT = 0x08
+  };
+  static bool ParseNamedSpaceValue(const nsString& aString,
+                                   nsCSSValue& aCSSValue, uint32_t aFlags,
+                                   const Document& aDocument);
+
+  static bool ParseNumericValue(const nsString& aString, nsCSSValue& aCSSValue,
+                                uint32_t aFlags, Document* aDocument);
+
+  static void MapMathMLAttributesInto(const nsMappedAttributes* aAttributes,
+                                      mozilla::MappedDeclarations&);
+
+  void GetEventTargetParent(mozilla::EventChainPreVisitor& aVisitor) override;
+  MOZ_CAN_RUN_SCRIPT
+  nsresult PostHandleEvent(mozilla::EventChainPostVisitor& aVisitor) override;
+  nsresult Clone(mozilla::dom::NodeInfo*, nsINode** aResult) const override;
+  virtual mozilla::EventStates IntrinsicState() const override;
+  virtual bool IsNodeOfType(uint32_t aFlags) const override;
+
+  // Set during reflow as necessary. Does a style change notification,
+  // aNotify must be true.
+  void SetIncrementScriptLevel(bool aIncrementScriptLevel, bool aNotify);
+  bool GetIncrementScriptLevel() const { return mIncrementScriptLevel; }
+
+  virtual bool IsFocusableInternal(int32_t* aTabIndex,
+                                   bool aWithMouse) override;
+  virtual bool IsLink(nsIURI** aURI) const override;
+  virtual void GetLinkTarget(nsAString& aTarget) override;
+  virtual already_AddRefed<nsIURI> GetHrefURI() const override;
+
+  virtual void NodeInfoChanged(Document* aOldDoc) override {
+    ClearHasPendingLinkUpdate();
+    MathMLElementBase::NodeInfoChanged(aOldDoc);
+  }
+
+ protected:
+  virtual ~MathMLElement() {}
+
+  virtual JSObject* WrapNode(JSContext* aCx,
+                             JS::Handle<JSObject*> aGivenProto) override;
+
+  virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
+                                const nsAttrValue* aValue,
+                                const nsAttrValue* aOldValue,
+                                nsIPrincipal* aSubjectPrincipal,
+                                bool aNotify) override;
+
+ private:
+  bool mIncrementScriptLevel;
+};
+
+}  // namespace dom
+}  // namespace mozilla
+
+#endif  // mozilla_dom_MathMLElement_h_
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/moz.build firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/moz.build
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/moz.build	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/moz.build	2019-09-15 11:33:09.000000000 +0000
@@ -7,9 +7,13 @@
 with Files("**"):
     BUG_COMPONENT = ("Core", "MathML")
 
+EXPORTS.mozilla.dom += [
+    'MathMLElement.h',
+]
+
 UNIFIED_SOURCES += [
-    'nsMathMLElement.cpp',
-    'nsMathMLElementFactory.cpp',
+    'MathMLElement.cpp',
+    'MathMLElementFactory.cpp',
 ]
 
 include('/ipc/chromium/chromium-config.mozbuild')
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/nsMathMLElement.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/nsMathMLElement.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/nsMathMLElement.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/nsMathMLElement.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,974 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsMathMLElement.h"
-#include "base/compiler_specific.h"
-#include "mozilla/dom/BindContext.h"
-#include "mozilla/ArrayUtils.h"
-#include "mozilla/FontPropertyTypes.h"
-#include "mozilla/StaticPrefs_mathml.h"
-#include "mozilla/TextUtils.h"
-#include "nsGkAtoms.h"
-#include "nsITableCellLayout.h"  // for MAX_COLSPAN / MAX_ROWSPAN
-#include "nsLayoutStylesheetCache.h"
-#include "nsCSSValue.h"
-#include "nsMappedAttributes.h"
-#include "nsStyleConsts.h"
-#include "mozilla/dom/Document.h"
-#include "nsPresContext.h"
-#include "mozAutoDocUpdate.h"
-#include "nsIScriptError.h"
-#include "nsContentUtils.h"
-#include "nsIURI.h"
-
-#include "mozilla/EventDispatcher.h"
-#include "mozilla/EventStates.h"
-#include "mozilla/MappedDeclarations.h"
-#include "mozilla/dom/ElementBinding.h"
-
-using namespace mozilla;
-using namespace mozilla::dom;
-
-//----------------------------------------------------------------------
-// nsISupports methods:
-
-NS_IMPL_ISUPPORTS_INHERITED(nsMathMLElement, nsMathMLElementBase, Link)
-
-static nsresult WarnDeprecated(const char16_t* aDeprecatedAttribute,
-                               const char16_t* aFavoredAttribute,
-                               Document* aDocument) {
-  AutoTArray<nsString, 2> argv;
-  argv.AppendElement(aDeprecatedAttribute);
-  argv.AppendElement(aFavoredAttribute);
-  return nsContentUtils::ReportToConsole(
-      nsIScriptError::warningFlag, NS_LITERAL_CSTRING("MathML"), aDocument,
-      nsContentUtils::eMATHML_PROPERTIES, "DeprecatedSupersededBy", argv);
-}
-
-static nsresult ReportLengthParseError(const nsString& aValue,
-                                       Document* aDocument) {
-  AutoTArray<nsString, 1> arg = {aValue};
-  return nsContentUtils::ReportToConsole(
-      nsIScriptError::errorFlag, NS_LITERAL_CSTRING("MathML"), aDocument,
-      nsContentUtils::eMATHML_PROPERTIES, "LengthParsingError", arg);
-}
-
-static nsresult ReportParseErrorNoTag(const nsString& aValue, nsAtom* aAtom,
-                                      Document* aDocument) {
-  AutoTArray<nsString, 2> argv = {aValue, nsDependentAtomString(aAtom)};
-  return nsContentUtils::ReportToConsole(
-      nsIScriptError::errorFlag, NS_LITERAL_CSTRING("MathML"), aDocument,
-      nsContentUtils::eMATHML_PROPERTIES, "AttributeParsingErrorNoTag", argv);
-}
-
-nsMathMLElement::nsMathMLElement(
-    already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
-    : nsMathMLElementBase(std::move(aNodeInfo)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(Link(this)),
-      mIncrementScriptLevel(false) {}
-
-nsMathMLElement::nsMathMLElement(
-    already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo)
-    : nsMathMLElementBase(std::move(aNodeInfo)),
-      ALLOW_THIS_IN_INITIALIZER_LIST(Link(this)),
-      mIncrementScriptLevel(false) {}
-
-nsresult nsMathMLElement::BindToTree(BindContext& aContext, nsINode& aParent) {
-  Link::ResetLinkState(false, Link::ElementHasHref());
-
-  nsresult rv = nsMathMLElementBase::BindToTree(aContext, aParent);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  // FIXME(emilio): Probably should be composed, this uses all the other link
-  // infrastructure.
-  if (Document* doc = aContext.GetUncomposedDoc()) {
-    doc->RegisterPendingLinkUpdate(this);
-  }
-
-  // Set the bit in the document for telemetry.
-  if (Document* doc = aContext.GetComposedDoc()) {
-    doc->SetMathMLEnabled();
-  }
-
-  return rv;
-}
-
-void nsMathMLElement::UnbindFromTree(bool aNullParent) {
-  // Without removing the link state we risk a dangling pointer
-  // in the mStyledLinks hashtable
-  Link::ResetLinkState(false, Link::ElementHasHref());
-
-  nsMathMLElementBase::UnbindFromTree(aNullParent);
-}
-
-bool nsMathMLElement::ParseAttribute(int32_t aNamespaceID, nsAtom* aAttribute,
-                                     const nsAString& aValue,
-                                     nsIPrincipal* aMaybeScriptedPrincipal,
-                                     nsAttrValue& aResult) {
-  MOZ_ASSERT(IsMathMLElement());
-
-  if (aNamespaceID == kNameSpaceID_None) {
-    if (aAttribute == nsGkAtoms::color || aAttribute == nsGkAtoms::mathcolor_ ||
-        aAttribute == nsGkAtoms::background ||
-        aAttribute == nsGkAtoms::mathbackground_) {
-      return aResult.ParseColor(aValue);
-    }
-    if (mNodeInfo->Equals(nsGkAtoms::mtd_)) {
-      if (aAttribute == nsGkAtoms::columnspan_) {
-        aResult.ParseClampedNonNegativeInt(aValue, 1, 1, MAX_COLSPAN);
-        return true;
-      }
-      if (aAttribute == nsGkAtoms::rowspan) {
-        aResult.ParseClampedNonNegativeInt(aValue, 1, 0, MAX_ROWSPAN);
-        return true;
-      }
-    }
-  }
-
-  return nsMathMLElementBase::ParseAttribute(aNamespaceID, aAttribute, aValue,
-                                             aMaybeScriptedPrincipal, aResult);
-}
-
-// https://mathml-refresh.github.io/mathml-core/#global-attributes
-static Element::MappedAttributeEntry sGlobalAttributes[] = {
-    {nsGkAtoms::dir},
-    {nsGkAtoms::mathbackground_},
-    {nsGkAtoms::mathcolor_},
-    {nsGkAtoms::mathsize_},
-    {nsGkAtoms::mathvariant_},
-    {nsGkAtoms::scriptlevel_},
-    // XXXfredw: Also map displaystyle to CSS math-style?
-    {nullptr}};
-
-// XXXfredw(bug 1548471): Add a runtime flag to disable these attributes.
-static Element::MappedAttributeEntry sDeprecatedScriptAttributes[] = {
-    {nsGkAtoms::scriptminsize_}, {nsGkAtoms::scriptsizemultiplier_}, {nullptr}};
-
-static Element::MappedAttributeEntry sDeprecatedStyleAttributes[] = {
-    {nsGkAtoms::background},
-    {nsGkAtoms::color},
-    {nsGkAtoms::fontfamily_},
-    {nsGkAtoms::fontsize_},
-    {nsGkAtoms::fontstyle_},
-    {nsGkAtoms::fontweight_},
-    {nullptr}};
-
-bool nsMathMLElement::IsAttributeMapped(const nsAtom* aAttribute) const {
-  MOZ_ASSERT(IsMathMLElement());
-
-  static const MappedAttributeEntry* const globalMap[] = {
-      sGlobalAttributes, sDeprecatedScriptAttributes};
-  static const MappedAttributeEntry* const styleMap[] = {
-      sDeprecatedStyleAttributes};
-
-  return FindAttributeDependence(aAttribute, globalMap) ||
-         (!StaticPrefs::mathml_deprecated_style_attributes_disabled() &&
-          FindAttributeDependence(aAttribute, styleMap)) ||
-         (mNodeInfo->Equals(nsGkAtoms::mtable_) &&
-          aAttribute == nsGkAtoms::width);
-}
-
-nsMapRuleToAttributesFunc nsMathMLElement::GetAttributeMappingFunction() const {
-  // It doesn't really matter what our tag is here, because only attributes
-  // that satisfy IsAttributeMapped will be stored in the mapped attributes
-  // list and available to the mapping function
-  return &MapMathMLAttributesInto;
-}
-
-/* static */
-bool nsMathMLElement::ParseNamedSpaceValue(const nsString& aString,
-                                           nsCSSValue& aCSSValue,
-                                           uint32_t aFlags,
-                                           const Document& aDocument) {
-  if (StaticPrefs::mathml_mathspace_names_disabled()) {
-    return false;
-  }
-  int32_t i = 0;
-  // See if it is one of the 'namedspace' (ranging -7/18em, -6/18, ... 7/18em)
-  if (aString.EqualsLiteral("veryverythinmathspace")) {
-    i = 1;
-  } else if (aString.EqualsLiteral("verythinmathspace")) {
-    i = 2;
-  } else if (aString.EqualsLiteral("thinmathspace")) {
-    i = 3;
-  } else if (aString.EqualsLiteral("mediummathspace")) {
-    i = 4;
-  } else if (aString.EqualsLiteral("thickmathspace")) {
-    i = 5;
-  } else if (aString.EqualsLiteral("verythickmathspace")) {
-    i = 6;
-  } else if (aString.EqualsLiteral("veryverythickmathspace")) {
-    i = 7;
-  } else if (aFlags & PARSE_ALLOW_NEGATIVE) {
-    if (aString.EqualsLiteral("negativeveryverythinmathspace")) {
-      i = -1;
-    } else if (aString.EqualsLiteral("negativeverythinmathspace")) {
-      i = -2;
-    } else if (aString.EqualsLiteral("negativethinmathspace")) {
-      i = -3;
-    } else if (aString.EqualsLiteral("negativemediummathspace")) {
-      i = -4;
-    } else if (aString.EqualsLiteral("negativethickmathspace")) {
-      i = -5;
-    } else if (aString.EqualsLiteral("negativeverythickmathspace")) {
-      i = -6;
-    } else if (aString.EqualsLiteral("negativeveryverythickmathspace")) {
-      i = -7;
-    }
-  }
-  if (0 != i) {
-    aDocument.WarnOnceAbout(dom::Document::eMathML_DeprecatedMathSpaceValue);
-    aCSSValue.SetFloatValue(float(i) / float(18), eCSSUnit_EM);
-    return true;
-  }
-
-  return false;
-}
-
-// The REC says:
-//
-// "Most presentation elements have attributes that accept values representing
-// lengths to be used for size, spacing or similar properties. The syntax of a
-// length is specified as
-//
-// number | number unit | namedspace
-//
-// There should be no space between the number and the unit of a length."
-//
-// "A trailing '%' represents a percent of the default value. The default
-// value, or how it is obtained, is listed in the table of attributes for each
-// element. [...] A number without a unit is intepreted as a multiple of the
-// default value."
-//
-// "The possible units in MathML are:
-//
-// Unit Description
-// em   an em (font-relative unit traditionally used for horizontal lengths)
-// ex   an ex (font-relative unit traditionally used for vertical lengths)
-// px   pixels, or size of a pixel in the current display
-// in   inches (1 inch = 2.54 centimeters)
-// cm   centimeters
-// mm   millimeters
-// pt   points (1 point = 1/72 inch)
-// pc   picas (1 pica = 12 points)
-// %    percentage of default value"
-//
-// The numbers are defined that way:
-// - unsigned-number: "a string of decimal digits with up to one decimal point
-//   (U+002E), representing a non-negative terminating decimal number (a type of
-//   rational number)"
-// - number: "an optional prefix of '-' (U+002D), followed by an unsigned
-//   number, representing a terminating decimal number (a type of rational
-//   number)"
-//
-/* static */
-// XXXfredw: Deprecate legacy MathML syntax and use the CSS parser instead.
-// See https://github.com/mathml-refresh/mathml/issues/63
-bool nsMathMLElement::ParseNumericValue(const nsString& aString,
-                                        nsCSSValue& aCSSValue, uint32_t aFlags,
-                                        Document* aDocument) {
-  nsAutoString str(aString);
-  str.CompressWhitespace();  // aString is const in this code...
-
-  int32_t stringLength = str.Length();
-  if (!stringLength) {
-    if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
-      ReportLengthParseError(aString, aDocument);
-    }
-    return false;
-  }
-
-  if (aDocument && ParseNamedSpaceValue(str, aCSSValue, aFlags, *aDocument)) {
-    return true;
-  }
-
-  nsAutoString number, unit;
-
-  // see if the negative sign is there
-  int32_t i = 0;
-  char16_t c = str[0];
-  if (c == '-') {
-    number.Append(c);
-    i++;
-  }
-
-  // Gather up characters that make up the number
-  bool gotDot = false;
-  for (; i < stringLength; i++) {
-    c = str[i];
-    if (gotDot && c == '.') {
-      if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
-        ReportLengthParseError(aString, aDocument);
-      }
-      return false;  // two dots encountered
-    } else if (c == '.')
-      gotDot = true;
-    else if (!IsAsciiDigit(c)) {
-      str.Right(unit, stringLength - i);
-      // some authors leave blanks before the unit, but that shouldn't
-      // be allowed, so don't CompressWhitespace on 'unit'.
-      break;
-    }
-    number.Append(c);
-  }
-  if (StaticPrefs::mathml_legacy_number_syntax_disabled() &&
-      gotDot && str[i - 1] == '.') {
-    if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
-      ReportLengthParseError(aString, aDocument);
-    }
-    return false; // Number ending with a dot.
-  }
-
-  // Convert number to floating point
-  nsresult errorCode;
-  float floatValue = number.ToFloat(&errorCode);
-  if (NS_FAILED(errorCode)) {
-    if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
-      ReportLengthParseError(aString, aDocument);
-    }
-    return false;
-  }
-  if (floatValue < 0 && !(aFlags & PARSE_ALLOW_NEGATIVE)) {
-    if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
-      ReportLengthParseError(aString, aDocument);
-    }
-    return false;
-  }
-
-  nsCSSUnit cssUnit;
-  if (unit.IsEmpty()) {
-    if (!StaticPrefs::mathml_nonzero_unitless_lengths_disabled() &&
-        (aFlags & PARSE_ALLOW_UNITLESS)) {
-      // no explicit unit, this is a number that will act as a multiplier
-      if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
-        nsContentUtils::ReportToConsole(nsIScriptError::warningFlag,
-                                        NS_LITERAL_CSTRING("MathML"), aDocument,
-                                        nsContentUtils::eMATHML_PROPERTIES,
-                                        "UnitlessValuesAreDeprecated");
-      }
-      if (aFlags & CONVERT_UNITLESS_TO_PERCENT) {
-        aCSSValue.SetPercentValue(floatValue);
-        return true;
-      } else
-        cssUnit = eCSSUnit_Number;
-    } else {
-      // We are supposed to have a unit, but there isn't one.
-      // If the value is 0 we can just call it "pixels" otherwise
-      // this is illegal.
-      if (floatValue != 0.0) {
-        if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
-          ReportLengthParseError(aString, aDocument);
-        }
-        return false;
-      }
-      cssUnit = eCSSUnit_Pixel;
-    }
-  } else if (unit.EqualsLiteral("%")) {
-    aCSSValue.SetPercentValue(floatValue / 100.0f);
-    return true;
-  } else if (unit.LowerCaseEqualsLiteral("em"))
-    cssUnit = eCSSUnit_EM;
-  else if (unit.LowerCaseEqualsLiteral("ex"))
-    cssUnit = eCSSUnit_XHeight;
-  else if (unit.LowerCaseEqualsLiteral("px"))
-    cssUnit = eCSSUnit_Pixel;
-  else if (unit.LowerCaseEqualsLiteral("in"))
-    cssUnit = eCSSUnit_Inch;
-  else if (unit.LowerCaseEqualsLiteral("cm"))
-    cssUnit = eCSSUnit_Centimeter;
-  else if (unit.LowerCaseEqualsLiteral("mm"))
-    cssUnit = eCSSUnit_Millimeter;
-  else if (unit.LowerCaseEqualsLiteral("pt"))
-    cssUnit = eCSSUnit_Point;
-  else if (unit.LowerCaseEqualsLiteral("pc"))
-    cssUnit = eCSSUnit_Pica;
-  else if (unit.LowerCaseEqualsLiteral("q"))
-    cssUnit = eCSSUnit_Quarter;
-  else {  // unexpected unit
-    if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) {
-      ReportLengthParseError(aString, aDocument);
-    }
-    return false;
-  }
-
-  aCSSValue.SetFloatValue(floatValue, cssUnit);
-  return true;
-}
-
-void nsMathMLElement::MapMathMLAttributesInto(
-    const nsMappedAttributes* aAttributes, MappedDeclarations& aDecls) {
-  // scriptsizemultiplier
-  //
-  // "Specifies the multiplier to be used to adjust font size due to changes
-  // in scriptlevel.
-  //
-  // values: number
-  // default: 0.71
-  //
-  const nsAttrValue* value =
-      aAttributes->GetAttr(nsGkAtoms::scriptsizemultiplier_);
-  if (value && value->Type() == nsAttrValue::eString &&
-      !aDecls.PropertyIsSet(eCSSProperty__moz_script_size_multiplier)) {
-    nsAutoString str(value->GetStringValue());
-    str.CompressWhitespace();
-    // MathML numbers can't have leading '+'
-    if (str.Length() > 0 && str.CharAt(0) != '+') {
-      nsresult errorCode;
-      float floatValue = str.ToFloat(&errorCode);
-      // Negative scriptsizemultipliers are not parsed
-      if (NS_SUCCEEDED(errorCode) && floatValue >= 0.0f) {
-        aDecls.SetNumberValue(eCSSProperty__moz_script_size_multiplier,
-                              floatValue);
-      } else {
-        ReportParseErrorNoTag(str, nsGkAtoms::scriptsizemultiplier_,
-                              aDecls.Document());
-      }
-    }
-  }
-
-  // scriptminsize
-  //
-  // "Specifies the minimum font size allowed due to changes in scriptlevel.
-  // Note that this does not limit the font size due to changes to mathsize."
-  //
-  // values: length
-  // default: 8pt
-  //
-  // We don't allow negative values.
-  // Unitless and percent values give a multiple of the default value.
-  //
-  value = aAttributes->GetAttr(nsGkAtoms::scriptminsize_);
-  if (value && value->Type() == nsAttrValue::eString &&
-      !aDecls.PropertyIsSet(eCSSProperty__moz_script_min_size)) {
-    nsCSSValue scriptMinSize;
-    ParseNumericValue(value->GetStringValue(), scriptMinSize,
-                      PARSE_ALLOW_UNITLESS | CONVERT_UNITLESS_TO_PERCENT,
-                      aDecls.Document());
-
-    if (scriptMinSize.GetUnit() == eCSSUnit_Percent) {
-      scriptMinSize.SetFloatValue(8.0 * scriptMinSize.GetPercentValue(),
-                                  eCSSUnit_Point);
-    }
-    if (scriptMinSize.GetUnit() != eCSSUnit_Null) {
-      aDecls.SetLengthValue(eCSSProperty__moz_script_min_size, scriptMinSize);
-    }
-  }
-
-  // scriptlevel
-  //
-  // "Changes the scriptlevel in effect for the children. When the value is
-  // given without a sign, it sets scriptlevel to the specified value; when a
-  // sign is given, it increments ("+") or decrements ("-") the current
-  // value. (Note that large decrements can result in negative values of
-  // scriptlevel, but these values are considered legal.)"
-  //
-  // values: ( "+" | "-" )? unsigned-integer
-  // default: inherited
-  //
-  value = aAttributes->GetAttr(nsGkAtoms::scriptlevel_);
-  if (value && value->Type() == nsAttrValue::eString &&
-      !aDecls.PropertyIsSet(eCSSProperty__moz_script_level)) {
-    nsAutoString str(value->GetStringValue());
-    str.CompressWhitespace();
-    if (str.Length() > 0) {
-      nsresult errorCode;
-      int32_t intValue = str.ToInteger(&errorCode);
-      if (NS_SUCCEEDED(errorCode)) {
-        // This is kind of cheesy ... if the scriptlevel has a sign,
-        // then it's a relative value and we store the nsCSSValue as an
-        // Integer to indicate that. Otherwise we store it as a Number
-        // to indicate that the scriptlevel is absolute.
-        char16_t ch = str.CharAt(0);
-        if (ch == '+' || ch == '-') {
-          aDecls.SetIntValue(eCSSProperty__moz_script_level, intValue);
-        } else {
-          aDecls.SetNumberValue(eCSSProperty__moz_script_level, intValue);
-        }
-      } else {
-        ReportParseErrorNoTag(str, nsGkAtoms::scriptlevel_, aDecls.Document());
-      }
-    }
-  }
-
-  // mathsize
-  //
-  // "Specifies the size to display the token content. The values 'small' and
-  // 'big' choose a size smaller or larger than the current font size, but
-  // leave the exact proportions unspecified; 'normal' is allowed for
-  // completeness, but since it is equivalent to '100%' or '1em', it has no
-  // effect."
-  //
-  // values: "small" | "normal" | "big" | length
-  // default: inherited
-  //
-  // fontsize
-  //
-  // "Specified the size for the token. Deprecated in favor of mathsize."
-  //
-  // values: length
-  // default: inherited
-  //
-  // In both cases, we don't allow negative values.
-  // Unitless values give a multiple of the default value.
-  //
-  bool parseSizeKeywords = !StaticPrefs::mathml_mathsize_names_disabled();
-  value = aAttributes->GetAttr(nsGkAtoms::mathsize_);
-  if (!value) {
-    parseSizeKeywords = false;
-    value = aAttributes->GetAttr(nsGkAtoms::fontsize_);
-    if (value) {
-      aDecls.Document()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedStyleAttribute);
-    }
-  }
-  if (value && value->Type() == nsAttrValue::eString &&
-      !aDecls.PropertyIsSet(eCSSProperty_font_size)) {
-    nsAutoString str(value->GetStringValue());
-    nsCSSValue fontSize;
-    uint32_t flags = PARSE_ALLOW_UNITLESS | CONVERT_UNITLESS_TO_PERCENT;
-    if (parseSizeKeywords) {
-      // Do not warn for invalid value if mathsize keywords are accepted.
-      flags |= PARSE_SUPPRESS_WARNINGS;
-    }
-    if (!ParseNumericValue(str, fontSize, flags, nullptr) &&
-        parseSizeKeywords) {
-      static const char sizes[3][7] = {"small", "normal", "big"};
-      static const int32_t values[MOZ_ARRAY_LENGTH(sizes)] = {
-          NS_STYLE_FONT_SIZE_SMALL, NS_STYLE_FONT_SIZE_MEDIUM,
-          NS_STYLE_FONT_SIZE_LARGE};
-      str.CompressWhitespace();
-      for (uint32_t i = 0; i < ArrayLength(sizes); ++i) {
-        if (str.EqualsASCII(sizes[i])) {
-          aDecls.Document()->WarnOnceAbout(
-              dom::Document::eMathML_DeprecatedMathSizeValue);
-          aDecls.SetKeywordValue(eCSSProperty_font_size, values[i]);
-          break;
-        }
-      }
-    } else if (fontSize.GetUnit() == eCSSUnit_Percent) {
-      aDecls.SetPercentValue(eCSSProperty_font_size,
-                             fontSize.GetPercentValue());
-    } else if (fontSize.GetUnit() != eCSSUnit_Null) {
-      aDecls.SetLengthValue(eCSSProperty_font_size, fontSize);
-    }
-  }
-
-  // fontfamily
-  //
-  // "Should be the name of a font that may be available to a MathML renderer,
-  // or a CSS font specification; See Section 6.5 Using CSS with MathML and
-  // CSS for more information. Deprecated in favor of mathvariant."
-  //
-  // values: string
-  //
-  value = aAttributes->GetAttr(nsGkAtoms::fontfamily_);
-  if (value) {
-    aDecls.Document()->WarnOnceAbout(
-        dom::Document::eMathML_DeprecatedStyleAttribute);
-  }
-  if (value && value->Type() == nsAttrValue::eString &&
-      !aDecls.PropertyIsSet(eCSSProperty_font_family)) {
-    aDecls.SetFontFamily(value->GetStringValue());
-  }
-
-  // fontstyle
-  //
-  // "Specified the font style to use for the token. Deprecated in favor of
-  //  mathvariant."
-  //
-  // values: "normal" | "italic"
-  // default:	normal (except on <mi>)
-  //
-  // Note that the font-style property is reset in layout/style/ when
-  // -moz-math-variant is specified.
-  value = aAttributes->GetAttr(nsGkAtoms::fontstyle_);
-  if (value) {
-    aDecls.Document()->WarnOnceAbout(
-        dom::Document::eMathML_DeprecatedStyleAttribute);
-    if (value->Type() == nsAttrValue::eString &&
-        !aDecls.PropertyIsSet(eCSSProperty_font_style)) {
-      nsAutoString str(value->GetStringValue());
-      str.CompressWhitespace();
-      // FIXME(emilio): This should use FontSlantStyle or what not. Or even
-      // better, it looks deprecated since forever, we should just kill it.
-      if (str.EqualsASCII("normal")) {
-        aDecls.SetKeywordValue(eCSSProperty_font_style, NS_FONT_STYLE_NORMAL);
-      } else if (str.EqualsASCII("italic")) {
-        aDecls.SetKeywordValue(eCSSProperty_font_style, NS_FONT_STYLE_ITALIC);
-      }
-    }
-  }
-
-  // fontweight
-  //
-  // "Specified the font weight for the token. Deprecated in favor of
-  // mathvariant."
-  //
-  // values: "normal" | "bold"
-  // default: normal
-  //
-  // Note that the font-weight property is reset in layout/style/ when
-  // -moz-math-variant is specified.
-  value = aAttributes->GetAttr(nsGkAtoms::fontweight_);
-  if (value) {
-    aDecls.Document()->WarnOnceAbout(
-        dom::Document::eMathML_DeprecatedStyleAttribute);
-    if (value->Type() == nsAttrValue::eString &&
-        !aDecls.PropertyIsSet(eCSSProperty_font_weight)) {
-      nsAutoString str(value->GetStringValue());
-      str.CompressWhitespace();
-      if (str.EqualsASCII("normal")) {
-        aDecls.SetKeywordValue(eCSSProperty_font_weight,
-                               FontWeight::Normal().ToFloat());
-      } else if (str.EqualsASCII("bold")) {
-        aDecls.SetKeywordValue(eCSSProperty_font_weight,
-                               FontWeight::Bold().ToFloat());
-      }
-    }
-  }
-
-  // mathvariant
-  //
-  // "Specifies the logical class of the token. Note that this class is more
-  // than styling, it typically conveys semantic intent;"
-  //
-  // values: "normal" | "bold" | "italic" | "bold-italic" | "double-struck" |
-  // "bold-fraktur" | "script" | "bold-script" | "fraktur" | "sans-serif" |
-  // "bold-sans-serif" | "sans-serif-italic" | "sans-serif-bold-italic" |
-  // "monospace" | "initial" | "tailed" | "looped" | "stretched"
-  // default: normal (except on <mi>)
-  //
-  value = aAttributes->GetAttr(nsGkAtoms::mathvariant_);
-  if (value && value->Type() == nsAttrValue::eString &&
-      !aDecls.PropertyIsSet(eCSSProperty__moz_math_variant)) {
-    nsAutoString str(value->GetStringValue());
-    str.CompressWhitespace();
-    static const char sizes[19][23] = {"normal",
-                                       "bold",
-                                       "italic",
-                                       "bold-italic",
-                                       "script",
-                                       "bold-script",
-                                       "fraktur",
-                                       "double-struck",
-                                       "bold-fraktur",
-                                       "sans-serif",
-                                       "bold-sans-serif",
-                                       "sans-serif-italic",
-                                       "sans-serif-bold-italic",
-                                       "monospace",
-                                       "initial",
-                                       "tailed",
-                                       "looped",
-                                       "stretched"};
-    static const int32_t values[MOZ_ARRAY_LENGTH(sizes)] = {
-        NS_MATHML_MATHVARIANT_NORMAL,
-        NS_MATHML_MATHVARIANT_BOLD,
-        NS_MATHML_MATHVARIANT_ITALIC,
-        NS_MATHML_MATHVARIANT_BOLD_ITALIC,
-        NS_MATHML_MATHVARIANT_SCRIPT,
-        NS_MATHML_MATHVARIANT_BOLD_SCRIPT,
-        NS_MATHML_MATHVARIANT_FRAKTUR,
-        NS_MATHML_MATHVARIANT_DOUBLE_STRUCK,
-        NS_MATHML_MATHVARIANT_BOLD_FRAKTUR,
-        NS_MATHML_MATHVARIANT_SANS_SERIF,
-        NS_MATHML_MATHVARIANT_BOLD_SANS_SERIF,
-        NS_MATHML_MATHVARIANT_SANS_SERIF_ITALIC,
-        NS_MATHML_MATHVARIANT_SANS_SERIF_BOLD_ITALIC,
-        NS_MATHML_MATHVARIANT_MONOSPACE,
-        NS_MATHML_MATHVARIANT_INITIAL,
-        NS_MATHML_MATHVARIANT_TAILED,
-        NS_MATHML_MATHVARIANT_LOOPED,
-        NS_MATHML_MATHVARIANT_STRETCHED};
-    for (uint32_t i = 0; i < ArrayLength(sizes); ++i) {
-      if (str.LowerCaseEqualsASCII(sizes[i])) {
-        aDecls.SetKeywordValue(eCSSProperty__moz_math_variant, values[i]);
-        break;
-      }
-    }
-  }
-
-  // mathbackground
-  //
-  // "Specifies the background color to be used to fill in the bounding box of
-  // the element and its children. The default, 'transparent', lets the
-  // background color, if any, used in the current rendering context to show
-  // through."
-  //
-  // values: color | "transparent"
-  // default: "transparent"
-  //
-  // background
-  //
-  // "Specified the background color to be used to fill in the bounding box of
-  // the element and its children. Deprecated in favor of mathbackground."
-  //
-  // values: color | "transparent"
-  // default: "transparent"
-  //
-  value = aAttributes->GetAttr(nsGkAtoms::mathbackground_);
-  if (!value) {
-    value = aAttributes->GetAttr(nsGkAtoms::background);
-    if (value) {
-      aDecls.Document()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedStyleAttribute);
-    }
-  }
-  if (value) {
-    nscolor color;
-    if (value->GetColorValue(color)) {
-      aDecls.SetColorValueIfUnset(eCSSProperty_background_color, color);
-    }
-  }
-
-  // mathcolor
-  //
-  // "Specifies the foreground color to use when drawing the components of this
-  // element, such as the content for token elements or any lines, surds, or
-  // other decorations. It also establishes the default mathcolor used for
-  // child elements when used on a layout element."
-  //
-  // values: color
-  // default: inherited
-  //
-  // color
-  //
-  // "Specified the color for the token. Deprecated in favor of mathcolor."
-  //
-  // values: color
-  // default: inherited
-  //
-  value = aAttributes->GetAttr(nsGkAtoms::mathcolor_);
-  if (!value) {
-    value = aAttributes->GetAttr(nsGkAtoms::color);
-    if (value) {
-      aDecls.Document()->WarnOnceAbout(
-          dom::Document::eMathML_DeprecatedStyleAttribute);
-    }
-  }
-  nscolor color;
-  if (value && value->GetColorValue(color)) {
-    aDecls.SetColorValueIfUnset(eCSSProperty_color, color);
-  }
-
-  // width
-  //
-  // "Specifies the desired width of the entire table and is intended for
-  // visual user agents. When the value is a percentage value, the value is
-  // relative to the horizontal space a MathML renderer has available for the
-  // math element. When the value is "auto", the MathML renderer should
-  // calculate the table width from its contents using whatever layout
-  // algorithm it chooses. "
-  //
-  // values: "auto" | length
-  // default: auto
-  //
-  if (!aDecls.PropertyIsSet(eCSSProperty_width)) {
-    const nsAttrValue* value = aAttributes->GetAttr(nsGkAtoms::width);
-    nsCSSValue width;
-    // This does not handle auto and unitless values
-    if (value && value->Type() == nsAttrValue::eString) {
-      ParseNumericValue(value->GetStringValue(), width, 0, aDecls.Document());
-      if (width.GetUnit() == eCSSUnit_Percent) {
-        aDecls.SetPercentValue(eCSSProperty_width, width.GetPercentValue());
-      } else if (width.GetUnit() != eCSSUnit_Null) {
-        aDecls.SetLengthValue(eCSSProperty_width, width);
-      }
-    }
-  }
-
-  // dir
-  //
-  // Overall Directionality of Mathematics Formulas:
-  // "The overall directionality for a formula, basically the direction of the
-  // Layout Schemata, is specified by the dir attribute on the containing math
-  // element (see Section 2.2 The Top-Level math Element). The default is ltr.
-  // [...] The overall directionality is usually set on the math, but may also
-  // be switched for individual subformula by using the dir attribute on mrow
-  // or mstyle elements."
-  //
-  // Bidirectional Layout in Token Elements:
-  // "Specifies the initial directionality for text within the token:
-  // ltr (Left To Right) or rtl (Right To Left). This attribute should only be
-  // needed in rare cases involving weak or neutral characters;
-  // see Section 3.1.5.1 Overall Directionality of Mathematics Formulas for
-  // further discussion. It has no effect on mspace."
-  //
-  // values: "ltr" | "rtl"
-  // default: inherited
-  //
-  value = aAttributes->GetAttr(nsGkAtoms::dir);
-  if (value && value->Type() == nsAttrValue::eString &&
-      !aDecls.PropertyIsSet(eCSSProperty_direction)) {
-    nsAutoString str(value->GetStringValue());
-    static const char dirs[][4] = {"ltr", "rtl"};
-    static const int32_t dirValues[MOZ_ARRAY_LENGTH(dirs)] = {
-        NS_STYLE_DIRECTION_LTR, NS_STYLE_DIRECTION_RTL};
-    for (uint32_t i = 0; i < ArrayLength(dirs); ++i) {
-      if (str.LowerCaseEqualsASCII(dirs[i])) {
-        aDecls.SetKeywordValue(eCSSProperty_direction, dirValues[i]);
-        break;
-      }
-    }
-  }
-}
-
-void nsMathMLElement::GetEventTargetParent(EventChainPreVisitor& aVisitor) {
-  Element::GetEventTargetParent(aVisitor);
-
-  GetEventTargetParentForLinks(aVisitor);
-}
-
-nsresult nsMathMLElement::PostHandleEvent(EventChainPostVisitor& aVisitor) {
-  return PostHandleEventForLinks(aVisitor);
-}
-
-NS_IMPL_ELEMENT_CLONE(nsMathMLElement)
-
-EventStates nsMathMLElement::IntrinsicState() const {
-  return Link::LinkState() | nsMathMLElementBase::IntrinsicState() |
-         (mIncrementScriptLevel ? NS_EVENT_STATE_INCREMENT_SCRIPT_LEVEL
-                                : EventStates());
-}
-
-bool nsMathMLElement::IsNodeOfType(uint32_t aFlags) const { return false; }
-
-void nsMathMLElement::SetIncrementScriptLevel(bool aIncrementScriptLevel,
-                                              bool aNotify) {
-  if (aIncrementScriptLevel == mIncrementScriptLevel) return;
-  mIncrementScriptLevel = aIncrementScriptLevel;
-
-  NS_ASSERTION(aNotify, "We always notify!");
-
-  UpdateState(true);
-}
-
-bool nsMathMLElement::IsFocusableInternal(int32_t* aTabIndex, bool aWithMouse) {
-  nsCOMPtr<nsIURI> uri;
-  if (IsLink(getter_AddRefs(uri))) {
-    if (aTabIndex) {
-      *aTabIndex = ((sTabFocusModel & eTabFocus_linksMask) == 0 ? -1 : 0);
-    }
-    return true;
-  }
-
-  if (aTabIndex) {
-    *aTabIndex = -1;
-  }
-
-  return false;
-}
-
-bool nsMathMLElement::IsLink(nsIURI** aURI) const {
-  bool hasHref = false;
-  const nsAttrValue* href = mAttrs.GetAttr(nsGkAtoms::href, kNameSpaceID_None);
-  if (href) {
-    // MathML href
-    // The REC says: "When user agents encounter MathML elements with both href
-    // and xlink:href attributes, the href attribute should take precedence."
-    hasHref = true;
-  } else {
-    // To be a clickable XLink for styling and interaction purposes, we require:
-    //
-    //   xlink:href    - must be set
-    //   xlink:type    - must be unset or set to "" or set to "simple"
-    //   xlink:show    - must be unset or set to "", "new" or "replace"
-    //   xlink:actuate - must be unset or set to "" or "onRequest"
-    //
-    // For any other values, we're either not a *clickable* XLink, or the end
-    // result is poorly specified. Either way, we return false.
-
-    static Element::AttrValuesArray sTypeVals[] = {nsGkAtoms::_empty,
-                                                   nsGkAtoms::simple, nullptr};
-
-    static Element::AttrValuesArray sShowVals[] = {
-        nsGkAtoms::_empty, nsGkAtoms::_new, nsGkAtoms::replace, nullptr};
-
-    static Element::AttrValuesArray sActuateVals[] = {
-        nsGkAtoms::_empty, nsGkAtoms::onRequest, nullptr};
-
-    // Optimization: check for href first for early return
-    href = mAttrs.GetAttr(nsGkAtoms::href, kNameSpaceID_XLink);
-    if (href &&
-        FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::type, sTypeVals,
-                        eCaseMatters) != Element::ATTR_VALUE_NO_MATCH &&
-        FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::show, sShowVals,
-                        eCaseMatters) != Element::ATTR_VALUE_NO_MATCH &&
-        FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::actuate, sActuateVals,
-                        eCaseMatters) != Element::ATTR_VALUE_NO_MATCH) {
-      hasHref = true;
-    }
-  }
-
-  if (hasHref) {
-    // Get absolute URI
-    nsAutoString hrefStr;
-    href->ToString(hrefStr);
-    nsContentUtils::NewURIWithDocumentCharset(aURI, hrefStr, OwnerDoc(),
-                                              GetBaseURI());
-    // must promise out param is non-null if we return true
-    return !!*aURI;
-  }
-
-  *aURI = nullptr;
-  return false;
-}
-
-void nsMathMLElement::GetLinkTarget(nsAString& aTarget) {
-  const nsAttrValue* target =
-      mAttrs.GetAttr(nsGkAtoms::target, kNameSpaceID_XLink);
-  if (target) {
-    target->ToString(aTarget);
-  }
-
-  if (aTarget.IsEmpty()) {
-    static Element::AttrValuesArray sShowVals[] = {nsGkAtoms::_new,
-                                                   nsGkAtoms::replace, nullptr};
-
-    switch (FindAttrValueIn(kNameSpaceID_XLink, nsGkAtoms::show, sShowVals,
-                            eCaseMatters)) {
-      case 0:
-        aTarget.AssignLiteral("_blank");
-        return;
-      case 1:
-        return;
-    }
-    OwnerDoc()->GetBaseTarget(aTarget);
-  }
-}
-
-already_AddRefed<nsIURI> nsMathMLElement::GetHrefURI() const {
-  nsCOMPtr<nsIURI> hrefURI;
-  return IsLink(getter_AddRefs(hrefURI)) ? hrefURI.forget() : nullptr;
-}
-
-nsresult nsMathMLElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
-                                       const nsAttrValue* aValue,
-                                       const nsAttrValue* aOldValue,
-                                       nsIPrincipal* aSubjectPrincipal,
-                                       bool aNotify) {
-  // It is important that this be done after the attribute is set/unset.
-  // We will need the updated attribute value because notifying the document
-  // that content states have changed will call IntrinsicState, which will try
-  // to get updated information about the visitedness from Link.
-  if (aName == nsGkAtoms::href && (aNameSpaceID == kNameSpaceID_None ||
-                                   aNameSpaceID == kNameSpaceID_XLink)) {
-    if (aValue && aNameSpaceID == kNameSpaceID_XLink) {
-      WarnDeprecated(u"xlink:href", u"href", OwnerDoc());
-    }
-    // Note: When unsetting href, there may still be another href since there
-    // are 2 possible namespaces.
-    Link::ResetLinkState(aNotify, aValue || Link::ElementHasHref());
-  }
-
-  return nsMathMLElementBase::AfterSetAttr(
-      aNameSpaceID, aName, aValue, aOldValue, aSubjectPrincipal, aNotify);
-}
-
-JSObject* nsMathMLElement::WrapNode(JSContext* aCx,
-                                    JS::Handle<JSObject*> aGivenProto) {
-  return Element_Binding::Wrap(aCx, this, aGivenProto);
-}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/nsMathMLElementFactory.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/nsMathMLElementFactory.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/nsMathMLElementFactory.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/nsMathMLElementFactory.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsContentCreatorFunctions.h"
-#include "nsGkAtoms.h"
-#include "nsMathMLElement.h"
-
-using namespace mozilla::dom;
-
-// MathML Element Factory (declared in nsContentCreatorFunctions.h)
-nsresult NS_NewMathMLElement(
-    Element** aResult, already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo) {
-  NS_ADDREF(*aResult = new nsMathMLElement(aNodeInfo));
-  return NS_OK;
-}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/nsMathMLElement.h firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/nsMathMLElement.h
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/mathml/nsMathMLElement.h	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/mathml/nsMathMLElement.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifndef nsMathMLElement_h
-#define nsMathMLElement_h
-
-#include "mozilla/Attributes.h"
-#include "mozilla/dom/Element.h"
-#include "nsMappedAttributeElement.h"
-#include "Link.h"
-#include "mozilla/dom/DOMRect.h"
-
-class nsCSSValue;
-
-typedef nsMappedAttributeElement nsMathMLElementBase;
-
-namespace mozilla {
-class EventChainPostVisitor;
-class EventChainPreVisitor;
-}  // namespace mozilla
-
-/*
- * The base class for MathML elements.
- */
-class nsMathMLElement final : public nsMathMLElementBase,
-                              public mozilla::dom::Link {
- public:
-  explicit nsMathMLElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
-  explicit nsMathMLElement(
-      already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
-
-  // Implementation of nsISupports is inherited from nsMathMLElementBase
-  NS_DECL_ISUPPORTS_INHERITED
-
-  nsresult BindToTree(BindContext&, nsINode& aParent) override;
-  virtual void UnbindFromTree(bool aNullParent = true) override;
-
-  virtual bool ParseAttribute(int32_t aNamespaceID, nsAtom* aAttribute,
-                              const nsAString& aValue,
-                              nsIPrincipal* aMaybeScriptedPrincipal,
-                              nsAttrValue& aResult) override;
-
-  NS_IMETHOD_(bool) IsAttributeMapped(const nsAtom* aAttribute) const override;
-  virtual nsMapRuleToAttributesFunc GetAttributeMappingFunction()
-      const override;
-
-  enum {
-    PARSE_ALLOW_UNITLESS = 0x01,  // unitless 0 will be turned into 0px
-    PARSE_ALLOW_NEGATIVE = 0x02,
-    PARSE_SUPPRESS_WARNINGS = 0x04,
-    CONVERT_UNITLESS_TO_PERCENT = 0x08
-  };
-  static bool ParseNamedSpaceValue(const nsString& aString,
-                                   nsCSSValue& aCSSValue, uint32_t aFlags,
-                                   const Document& aDocument);
-
-  static bool ParseNumericValue(const nsString& aString, nsCSSValue& aCSSValue,
-                                uint32_t aFlags, Document* aDocument);
-
-  static void MapMathMLAttributesInto(const nsMappedAttributes* aAttributes,
-                                      mozilla::MappedDeclarations&);
-
-  void GetEventTargetParent(mozilla::EventChainPreVisitor& aVisitor) override;
-  MOZ_CAN_RUN_SCRIPT
-  nsresult PostHandleEvent(mozilla::EventChainPostVisitor& aVisitor) override;
-  nsresult Clone(mozilla::dom::NodeInfo*, nsINode** aResult) const override;
-  virtual mozilla::EventStates IntrinsicState() const override;
-  virtual bool IsNodeOfType(uint32_t aFlags) const override;
-
-  // Set during reflow as necessary. Does a style change notification,
-  // aNotify must be true.
-  void SetIncrementScriptLevel(bool aIncrementScriptLevel, bool aNotify);
-  bool GetIncrementScriptLevel() const { return mIncrementScriptLevel; }
-
-  virtual bool IsFocusableInternal(int32_t* aTabIndex,
-                                   bool aWithMouse) override;
-  virtual bool IsLink(nsIURI** aURI) const override;
-  virtual void GetLinkTarget(nsAString& aTarget) override;
-  virtual already_AddRefed<nsIURI> GetHrefURI() const override;
-
-  virtual void NodeInfoChanged(Document* aOldDoc) override {
-    ClearHasPendingLinkUpdate();
-    nsMathMLElementBase::NodeInfoChanged(aOldDoc);
-  }
-
- protected:
-  virtual ~nsMathMLElement() {}
-
-  virtual JSObject* WrapNode(JSContext* aCx,
-                             JS::Handle<JSObject*> aGivenProto) override;
-
-  virtual nsresult AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName,
-                                const nsAttrValue* aValue,
-                                const nsAttrValue* aOldValue,
-                                nsIPrincipal* aSubjectPrincipal,
-                                bool aNotify) override;
-
- private:
-  bool mIncrementScriptLevel;
-};
-
-#endif  // nsMathMLElement_h
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/media/mediasource/test/mochitest.ini firefox-trunk-71.0~a1~hg20190915r493291/dom/media/mediasource/test/mochitest.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/media/mediasource/test/mochitest.ini	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/media/mediasource/test/mochitest.ini	2019-09-15 11:33:09.000000000 +0000
@@ -56,7 +56,7 @@
 [test_AVC3_mp4.html]
 skip-if = toolkit == 'android' # Not supported on android
 [test_AudioChange_mp4.html]
-skip-if = toolkit == 'android' || (os == "win" && processor == "aarch64") # Not supported on android, aarch64 due to 1538331
+skip-if = toolkit == 'android' # Not supported on android
 [test_AutoRevocation.html]
 tags = firstpartyisolation
 [test_BufferedSeek.html]
@@ -83,7 +83,7 @@
 skip-if = toolkit == 'android' # Not supported on android
 [test_Eviction_mp4.html]
 [test_ExperimentalAsync.html]
-skip-if = toolkit == 'android' || (os == "win" && processor == "aarch64") # bug 1341519, bug 1401090, aarch64 due to 1538391
+skip-if = toolkit == 'android' # bug 1341519, bug 1401090
 [test_FrameSelection.html]
 skip-if = toolkit == 'android' # bug 1341519, bug 1401090
 [test_FrameSelection_mp4.html]
@@ -105,7 +105,6 @@
 [test_MediaSource_mp4.html]
 skip-if = toolkit == 'android' # Not supported on android
 [test_MediaSource_flac_mp4.html]
-skip-if = (os == "win" && processor == "aarch64") # aarch64 due to 1526064
 [test_MediaSource_disabled.html]
 [test_MultipleInitSegments.html]
 [test_MultipleInitSegments_mp4.html]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/media/platforms/android/AndroidDataEncoder.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/media/platforms/android/AndroidDataEncoder.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/media/platforms/android/AndroidDataEncoder.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/media/platforms/android/AndroidDataEncoder.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -417,7 +417,7 @@
     const MediaDataEncoder::Rate aBitsPerSec) {
   RefPtr<AndroidDataEncoder> self(this);
   return InvokeAsync(mTaskQueue, __func__, [self, aBitsPerSec]() {
-    self->mJavaEncoder->SetRates(aBitsPerSec);
+    self->mJavaEncoder->SetBitrate(aBitsPerSec);
     return GenericPromise::CreateAndResolve(true, __func__);
   });
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/media/platforms/apple/AppleVTEncoder.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/media/platforms/apple/AppleVTEncoder.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/media/platforms/apple/AppleVTEncoder.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/media/platforms/apple/AppleVTEncoder.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -395,6 +395,10 @@
   bool succeeded = WriteExtraData(output, aBuffer, asAnnexB) &&
                    WriteNALUs(output, aBuffer, asAnnexB);
 
+  output->mTime = media::TimeUnit::FromSeconds(
+      CMTimeGetSeconds(CMSampleBufferGetPresentationTimeStamp(aBuffer)));
+  output->mDuration = media::TimeUnit::FromSeconds(
+      CMTimeGetSeconds(CMSampleBufferGetOutputDuration(aBuffer)));
   ProcessOutput(succeeded ? std::move(output) : nullptr);
 }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/media/platforms/apple/AppleVTEncoder.h firefox-trunk-71.0~a1~hg20190915r493291/dom/media/platforms/apple/AppleVTEncoder.h
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/media/platforms/apple/AppleVTEncoder.h	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/media/platforms/apple/AppleVTEncoder.h	2019-09-15 11:33:10.000000000 +0000
@@ -23,22 +23,6 @@
  public:
   using Config = H264Config;
 
-  struct FrameParams {
-    using TimeUnit = media::TimeUnit;
-
-    const gfx::IntSize mSize;
-    const TimeUnit mDecodeTime;
-    const TimeUnit mTimestamp;
-    const bool mIsKey;
-
-    FrameParams(gfx::IntSize aSize, TimeUnit aDecodeTime, TimeUnit aTimestamp,
-                bool aIsKey)
-        : mSize(aSize),
-          mDecodeTime(aDecodeTime),
-          mTimestamp(aTimestamp),
-          mIsKey(aIsKey) {}
-  };
-
   AppleVTEncoder(const Config& aConfig, RefPtr<TaskQueue> aTaskQueue)
       : mConfig(aConfig),
         mTaskQueue(aTaskQueue),
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/media/test/mochitest.ini firefox-trunk-71.0~a1~hg20190915r493291/dom/media/test/mochitest.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/media/test/mochitest.ini	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/media/test/mochitest.ini	2019-09-15 11:33:09.000000000 +0000
@@ -752,25 +752,23 @@
 skip-if = toolkit == 'android' # bug 896723, android(bug 1232305)
 [test_bug726904.html]
 [test_bug874897.html]
-skip-if = (android_version == '19' && debug) # android(bug 1232305)
 [test_bug879717.html]
 skip-if = toolkit == 'android' # bug 1285441, android(bug 1232305)
 tags=capturestream
 [test_bug883173.html]
-skip-if = (android_version == '23' && debug) || (android_version == '25' && debug) # android(bug 1232305)
+skip-if = (android_version == '25' && debug) # android(bug 1232305)
 [test_bug895091.html]
-skip-if = (android_version == '23' && debug) || (android_version == '25' && debug) # android(bug 1232305)
+skip-if = (android_version == '25' && debug) # android(bug 1232305)
 pengl/TextureHostOGL.cpp:645
 tags=webvtt
 [test_bug895305.html]
-skip-if = (android_version == '23' && debug) || (android_version == '25' && debug) # android(bug 1232305)
+skip-if = (android_version == '25' && debug) # android(bug 1232305)
 [test_bug919265.html]
-skip-if = (android_version == '23' && debug) || (android_version == '25' && debug) # android(bug 1232305)
+skip-if = (android_version == '25' && debug) # android(bug 1232305)
 [test_bug957847.html]
-skip-if = (android_version == '23' && debug) || (android_version == '25' && debug) # android(bug 1232305)
+skip-if = (android_version == '25' && debug) # android(bug 1232305)
 [test_bug1018933.html]
 [test_bug1113600.html]
-skip-if = android_version >= '19' # bug 1198168, android(bug 1232305)
 tags=capturestream
 [test_bug1242338.html]
 skip-if = toolkit == 'android' # bug 1306916, bug 1329566, android(bug 1232305)
@@ -783,13 +781,13 @@
 [test_bug1553262.html]
 tags=msg capturestream
 [test_can_play_type.html]
-skip-if = (android_version == '23' && debug) || (android_version == '25' && debug) # android(bug 1232305)
+skip-if = (android_version == '25' && debug) # android(bug 1232305)
 [test_can_play_type_mpeg.html]
-skip-if = (android_version == '23' && debug) || (android_version == '25' && debug) || (os == 'win' && processor == 'aarch64') # bug 1526080 # android(bug 1232305)
+skip-if = (android_version == '25' && debug) || (os == 'win' && processor == 'aarch64') # bug 1526080 # android(bug 1232305)
 [test_can_play_type_no_ogg.html]
-skip-if = (android_version == '23' && debug) || (android_version == '25' && debug) # android(bug 1232305)
+skip-if = (android_version == '25' && debug) # android(bug 1232305)
 [test_can_play_type_ogg.html]
-skip-if = (android_version == '23' && debug) || (android_version == '25' && debug) # android(bug 1232305)
+skip-if = (android_version == '25' && debug) # android(bug 1232305)
 [test_chaining.html]
 [test_clone_media_element.html]
 skip-if = toolkit == 'android' # bug 1108558, android(bug 1232305)
@@ -1004,58 +1002,40 @@
 [test_play_events_2.html]
 skip-if = toolkit == 'android' # bug 1302614, bug 1328749, android(bug 1232305)
 [test_play_promise_1.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_2.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_3.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_4.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_5.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_6.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_7.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_8.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_9.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_10.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_11.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_12.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_13.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_14.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_15.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_16.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_17.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_promise_18.html]
-skip-if = android_version == '23' # bug 1392196, bug 1415061
 tags=promise-play
 [test_play_twice.html]
 skip-if = appname == "seamonkey" || toolkit == 'android' #  Seamonkey: Bug 598252, bug 1307337, bug 1143695, android(bug 1232305)
@@ -1088,7 +1068,6 @@
 [test_video_dimensions.html]
 skip-if = toolkit == 'android' # bug 1298238, bug 1304535, android(bug 1232305)
 [test_resolution_change.html]
-skip-if = android_version >= '19' # bug 1393866
 tags=capturestream
 [test_resume.html]
 skip-if = true # bug 1021673
@@ -1160,10 +1139,8 @@
 [test_streams_firstframe.html]
 tags=msg capturestream
 [test_streams_gc.html]
-skip-if = (android_version == '19' && debug) # android(bug 1232305)
 tags=msg capturestream
 [test_streams_individual_pause.html]
-skip-if = android_version == '19' # android(bug 1232305)
 scheme=https
 tags=msg
 [test_streams_srcObject.html]
@@ -1293,7 +1270,7 @@
 [test_temporary_file_blob_video_plays.html]
 skip-if = toolkit == 'android' || (os == 'win' && processor == 'aarch64') # bug 1533534 # android(bug 1232305)
 [test_videoPlaybackQuality_totalFrames.html]
-skip-if = (os == 'win' || android_version >= '19' || (os == 'mac' && os_version == '10.14')) # bug 1374189, mac due to bug 1544938
+skip-if = os == 'win' || (os == 'mac' && os_version == '10.14') # bug 1374189, mac due to bug 1544938
 
 [test_video_gzip_encoding.html]
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/media/webspeech/synth/nsSpeechTask.h firefox-trunk-71.0~a1~hg20190915r493291/dom/media/webspeech/synth/nsSpeechTask.h
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/media/webspeech/synth/nsSpeechTask.h	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/media/webspeech/synth/nsSpeechTask.h	2019-09-15 11:33:09.000000000 +0000
@@ -19,12 +19,10 @@
 
 class SpeechSynthesisUtterance;
 class SpeechSynthesis;
-class SynthStreamListener;
 
 class nsSpeechTask : public nsISpeechTask,
                      public nsIAudioChannelAgentCallback,
                      public nsSupportsWeakReference {
-  friend class SynthStreamListener;
 
  public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/quota/ActorsParent.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/quota/ActorsParent.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/quota/ActorsParent.cpp	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/quota/ActorsParent.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -4280,7 +4280,7 @@
 
     for (const PersistenceType type : kBestEffortPersistenceTypes) {
       if (NS_WARN_IF(IsShuttingDown())) {
-        RETURN_STATUS_OR_RESULT(statusKeeper, NS_ERROR_FAILURE);
+        RETURN_STATUS_OR_RESULT(statusKeeper, NS_ERROR_ABORT);
       }
 
       rv = InitializeRepository(type);
@@ -4834,7 +4834,7 @@
              (rv = entries->GetNextFile(getter_AddRefs(childDirectory)))) &&
          childDirectory) {
     if (NS_WARN_IF(IsShuttingDown())) {
-      RETURN_STATUS_OR_RESULT(statusKeeper, NS_ERROR_FAILURE);
+      RETURN_STATUS_OR_RESULT(statusKeeper, NS_ERROR_ABORT);
     }
 
     bool isDirectory;
@@ -4940,7 +4940,7 @@
   while (NS_SUCCEEDED((rv = entries->GetNextFile(getter_AddRefs(file)))) &&
          file) {
     if (NS_WARN_IF(IsShuttingDown())) {
-      RETURN_STATUS_OR_RESULT(statusKeeper, NS_ERROR_FAILURE);
+      RETURN_STATUS_OR_RESULT(statusKeeper, NS_ERROR_ABORT);
     }
 
     bool isDirectory;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/csp/file_upgrade_insecure.html firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/csp/file_upgrade_insecure.html
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/csp/file_upgrade_insecure.html	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/csp/file_upgrade_insecure.html	2019-09-15 11:33:09.000000000 +0000
@@ -49,24 +49,28 @@
 
   <!-- websockets: upgrade ws:// to wss://-->
   <script type="application/javascript">
-    var mySocket = new WebSocket("ws://example.com/tests/dom/security/test/csp/file_upgrade_insecure");
-    mySocket.onopen = function(e) {
-      if (mySocket.url.includes("wss://")) {
-        window.parent.postMessage({result: "websocket-ok"}, "*");
-      }
-      else {
-        window.parent.postMessage({result: "websocket-error"}, "*");
-      }
-      mySocket.close();
-    };
-    mySocket.onerror = function(e) {
-      // debug information for Bug 1316305
-      dump("  xxx mySocket.onerror: (mySocket): " + mySocket + "\n");
-      dump("  xxx mySocket.onerror: (mySocket.url): " + mySocket.url + "\n");
-      dump("  xxx mySocket.onerror: (e): " + e + "\n");
-      dump("  xxx mySocket.onerror: (e.message): " + e.message + "\n");
-      window.parent.postMessage({result: "websocket-unexpected-error"}, "*");
-    };
+    // WebSocket tests are not supported on Android yet. Bug 1566168
+    const {AppConstants} = SpecialPowers.Cu.import("resource://gre/modules/AppConstants.jsm", {});
+    if (AppConstants.platform !== "android") {
+      var mySocket = new WebSocket("ws://example.com/tests/dom/security/test/csp/file_upgrade_insecure");
+      mySocket.onopen = function(e) {
+        if (mySocket.url.includes("wss://")) {
+          window.parent.postMessage({result: "websocket-ok"}, "*");
+        }
+        else {
+          window.parent.postMessage({result: "websocket-error"}, "*");
+        }
+        mySocket.close();
+      };
+      mySocket.onerror = function(e) {
+        // debug information for Bug 1316305
+        dump("  xxx mySocket.onerror: (mySocket): " + mySocket + "\n");
+        dump("  xxx mySocket.onerror: (mySocket.url): " + mySocket.url + "\n");
+        dump("  xxx mySocket.onerror: (e): " + e + "\n");
+        dump("  xxx mySocket.onerror: (e.message): " + e.message + "\n");
+        window.parent.postMessage({result: "websocket-unexpected-error"}, "*");
+      };
+    }
   </script>
 
   <!-- form action: (upgrade POST from http:// to https://) -->
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/csp/file_upgrade_insecure_meta.html firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/csp/file_upgrade_insecure_meta.html
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/csp/file_upgrade_insecure_meta.html	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/csp/file_upgrade_insecure_meta.html	2019-09-15 11:33:09.000000000 +0000
@@ -50,19 +50,23 @@
 
   <!-- websockets: upgrade ws:// to wss://-->
   <script type="application/javascript">
-    var mySocket = new WebSocket("ws://example.com/tests/dom/security/test/csp/file_upgrade_insecure");
-    mySocket.onopen = function(e) {
-      if (mySocket.url.includes("wss://")) {
-        window.parent.postMessage({result: "websocket-ok"}, "*");
-      }
-      else {
-        window.parent.postMessage({result: "websocket-error"}, "*");
-      }
-      mySocket.close();
-    };
-    mySocket.onerror = function(e) {
-      window.parent.postMessage({result: "websocket-unexpected-error"}, "*");
-    };
+    // WebSocket tests are not supported on Android Yet. Bug 1566168.
+    const {AppConstants} = SpecialPowers.Cu.import("resource://gre/modules/AppConstants.jsm", {});
+    if (AppConstants.platform !== "android") {
+      var mySocket = new WebSocket("ws://example.com/tests/dom/security/test/csp/file_upgrade_insecure");
+      mySocket.onopen = function(e) {
+        if (mySocket.url.includes("wss://")) {
+          window.parent.postMessage({result: "websocket-ok"}, "*");
+        }
+        else {
+          window.parent.postMessage({result: "websocket-error"}, "*");
+        }
+        mySocket.close();
+      };
+      mySocket.onerror = function(e) {
+        window.parent.postMessage({result: "websocket-unexpected-error"}, "*");
+      };
+    }
   </script>
 
   <!-- form action: (upgrade POST from http:// to https://) -->
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/csp/mochitest.ini firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/csp/mochitest.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/csp/mochitest.ini	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/csp/mochitest.ini	2019-09-15 11:33:09.000000000 +0000
@@ -258,7 +258,7 @@
 [test_frameancestors.html]
 skip-if = fission
 [test_frameancestors_userpass.html]
-skip-if = fission || toolkit == 'android' # Times out, not sure why (bug 1008445)
+skip-if = fission
 [test_inlinescript.html]
 [test_inlinestyle.html]
 [test_invalid_source_expression.html]
@@ -297,11 +297,9 @@
 [test_win_open_blocked.html]
 [test_upgrade_insecure.html]
 # no ssl support as well as websocket tests do not work (see test_websocket.html)
-skip-if = fission || (toolkit == 'android') || (os != 'linux' && !debug) # Bug 1183300
+skip-if = fission || (os != 'linux' && !debug) # Bug 1183300
 [test_upgrade_insecure_reporting.html]
-skip-if = toolkit == 'android'
 [test_upgrade_insecure_cors.html]
-skip-if = toolkit == 'android'
 [test_upgrade_insecure_loopback.html]
 [test_report_for_import.html]
 [test_blocked_uri_in_reports.html]
@@ -339,7 +337,7 @@
 [test_iframe_srcdoc.html]
 [test_image_nonce.html]
 [test_websocket_self.html]
-skip-if = toolkit == 'android'
+skip-if = toolkit == 'android' # no websocket support Bug 982828
 [test_ignore_xfo.html]
 [test_data_csp_inheritance.html]
 [test_data_csp_merge.html]
@@ -391,7 +389,7 @@
   file_script_template.html
   file_script_template.js
 [test_reloadInFreshProcess.html]
-# no ssl support on android and no large-allocation on win32
+# no e10s-multi support on android and no large-allocation on win32
 skip-if =
   (toolkit == 'android') || (os == 'win' && bits == 32) ||
   fission # Large allocation processes don't work correctly under Fission.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/csp/test_upgrade_insecure.html firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/csp/test_upgrade_insecure.html
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/csp/test_upgrade_insecure.html	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/csp/test_upgrade_insecure.html	2019-09-15 11:33:09.000000000 +0000
@@ -28,6 +28,8 @@
  * received by the server (*.sjs) were actually *https* requests.
  */
 
+const {AppConstants} = SpecialPowers.Cu.import("resource://gre/modules/AppConstants.jsm", {});
+
 const UPGRADE_POLICY =
   "upgrade-insecure-requests;" +               // upgrade all http requests to https
   "block-all-mixed-content;" +                 // upgrade should be enforced before block-all.
@@ -50,7 +52,7 @@
     deliveryMethod: "header",
     results: [
       "iframe-ok", "script-ok", "img-ok", "img-redir-ok", "font-ok", "xhr-ok", "style-ok",
-      "media-ok", "object-ok", "form-ok", "websocket-ok", "nested-img-ok"
+      "media-ok", "object-ok", "form-ok", "nested-img-ok"
     ]
   },
   { // (2) test that all requests within an >> http << page get updated
@@ -60,7 +62,7 @@
     deliveryMethod: "header",
     results: [
       "iframe-ok", "script-ok", "img-ok", "img-redir-ok", "font-ok", "xhr-ok", "style-ok",
-      "media-ok", "object-ok", "form-ok", "websocket-ok", "nested-img-ok"
+      "media-ok", "object-ok", "form-ok", "nested-img-ok"
     ]
   },
   { // (3) test that all requests within an >> http << page get updated, but do
@@ -71,7 +73,7 @@
     deliveryMethod: "header",
     results: [
       "iframe-ok", "script-ok", "img-ok", "img-redir-ok", "font-ok", "xhr-ok", "style-ok",
-      "media-ok", "object-ok", "form-ok", "websocket-ok", "nested-img-ok"
+      "media-ok", "object-ok", "form-ok", "nested-img-ok"
     ]
   },
   { // (4) test that no requests get updated if >> upgrade-insecure-requests << is not used
@@ -82,7 +84,7 @@
     results: [
       "iframe-error", "script-error", "img-error", "img-redir-error", "font-error",
       "xhr-error", "style-error", "media-error", "object-error", "form-error",
-      "websocket-error", "nested-img-error"
+      "nested-img-error"
     ]
   },
   { // (5) test that all requests within an >> https << page using meta CSP get updated
@@ -94,11 +96,18 @@
     deliveryMethod: "meta",
     results: [
       "iframe-ok", "script-ok", "img-ok", "img-redir-ok", "font-ok", "xhr-ok", "style-ok",
-      "media-ok", "object-ok", "form-ok", "websocket-ok", "nested-img-ok"
+      "media-ok", "object-ok", "form-ok", "nested-img-ok"
     ]
   },
 ];
 
+// TODO: WebSocket tests are not supported on Android Yet. Bug 1566168.
+if (AppConstants.platform !== "android") {
+    for (let test of tests) {
+        test.results.push(test.results[0] == "iframe-ok" ? "websocket-ok" : "websocket-error");
+    }
+}
+
 var counter = 0;
 var curTest;
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/general/mochitest.ini firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/general/mochitest.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/general/mochitest.ini	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/general/mochitest.ini	2019-09-15 11:33:09.000000000 +0000
@@ -35,13 +35,10 @@
 [test_nosniff_navigation.html]
 [test_block_script_wrong_mime.html]
 [test_block_toplevel_data_navigation.html]
-skip-if = toolkit == 'android' # intermittent failure
 [test_block_toplevel_data_img_navigation.html]
-skip-if = toolkit == 'android' # intermittent failure
 [test_allow_opening_data_pdf.html]
-skip-if = toolkit == 'android'
+skip-if = toolkit == 'android' # no pdf reader on Android
 [test_allow_opening_data_json.html]
-skip-if = toolkit == 'android'
 [test_block_subresource_redir_to_data.html]
 [test_same_site_cookies_subrequest.html]
 [test_same_site_cookies_toplevel_nav.html]
@@ -56,7 +53,7 @@
 [test_same_site_cookies_about.html]
 skip-if = fission # Fails intermittently under Fission
 [test_assert_about_page_no_csp.html]
-skip-if = !debug || toolkit == 'android'
+skip-if = !debug
 [test_same_site_cookies_laxByDefault.html]
 skip-if = fission
 support-files = closeWindow.sjs
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/mixedcontentblocker/file_main_bug803225.html firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/mixedcontentblocker/file_main_bug803225.html
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/mixedcontentblocker/file_main_bug803225.html	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/mixedcontentblocker/file_main_bug803225.html	2019-09-15 11:33:09.000000000 +0000
@@ -22,6 +22,7 @@
 -->
 
 <script>
+  const {AppConstants} = SpecialPowers.Cu.import("resource://gre/modules/AppConstants.jsm", {});
 
   //For tests that require setTimeout, set the timeout interval
   var TIMEOUT_INTERVAL = 100;
@@ -148,22 +149,24 @@
   mailtoProtocolStatus();
 
   // Test 7: wss protocol
-  var wss;
-  wss = new WebSocket("wss://example.com/tests/dom/security/test/mixedcontentblocker/file_main_bug803225_websocket");
-
-  var status_wss = "started";
-  wss.onopen = function(e) {
-     status_wss = "opened";
-     wss.close();
-  }
-  wss.onclose = function(e) {
-    if(status_wss == "opened") {
-      parent.postMessage({"test": "wss", "msg": "resource with wss protocol loaded"}, "http://mochi.test:8888");
-    } else {
-      parent.postMessage({"test": "wss", "msg": "resource with wss protocol did not load"}, "http://mochi.test:8888");
+  // WebSocket tests are not supported on Android Yet. Bug 1566168.
+  if (AppConstants.platform !== "android") {
+    var wss;
+    wss = new WebSocket("wss://example.com/tests/dom/security/test/mixedcontentblocker/file_main_bug803225_websocket");
+
+    var status_wss = "started";
+    wss.onopen = function(e) {
+       status_wss = "opened";
+       wss.close();
+    }
+    wss.onclose = function(e) {
+      if(status_wss == "opened") {
+        parent.postMessage({"test": "wss", "msg": "resource with wss protocol loaded"}, "http://mochi.test:8888");
+      } else {
+        parent.postMessage({"test": "wss", "msg": "resource with wss protocol did not load"}, "http://mochi.test:8888");
+      }
     }
   }
-
 </script>
 </body>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/mixedcontentblocker/mochitest.ini firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/mixedcontentblocker/mochitest.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/mixedcontentblocker/mochitest.ini	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/mixedcontentblocker/mochitest.ini	2019-09-15 11:33:09.000000000 +0000
@@ -24,8 +24,7 @@
 skip-if =
   (toolkit == 'android') || webrender || (verify && !debug && (os == 'linux')) # Android: TIMED_OUT; bug 1402554
 [test_bug803225.html]
-skip-if =
-  toolkit == 'android' || (os=='linux' && bits==32) || headless #Android: TIMED_OUT; Linux32:bug 1324870; Headless:bug 1405870
+skip-if = (os=='linux' && bits==32) || headless # Linux32:bug 1324870; Headless:bug 1405870
 [test_frameNavigation.html]
-skip-if = fission || toolkit == 'android' || webrender || (debug && (os == 'linux' || os == 'win')) || (os == 'win' && !debug) # Android: TIMED_OUT; webrender: bug 1424752 # Bug 1391823; Bug 1353608
+skip-if = fission || webrender || (debug && (os == 'linux' || os == 'win')) || (os == 'win' && !debug) # webrender: bug 1424752 # Bug 1391823; Bug 1353608
 [test_redirect.html]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/mixedcontentblocker/test_bug803225.html firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/mixedcontentblocker/test_bug803225.html
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/security/test/mixedcontentblocker/test_bug803225.html	2019-09-13 05:13:13.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/security/test/mixedcontentblocker/test_bug803225.html	2019-09-15 11:33:09.000000000 +0000
@@ -11,6 +11,8 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
 
   <script>
+  const {AppConstants} = SpecialPowers.Cu.import("resource://gre/modules/AppConstants.jsm", {});
+
   var counter = 0;
   var settings = [ [true, true], [true, false], [false, true], [false, false] ];
 
@@ -40,10 +42,14 @@
     unsafe_about: false,
     data_protocol: false,
     javascript: false,
-    mailto: false,
-    wss: false,
   };
 
+  if (AppConstants.platform !== "android") {
+    // WebSocket tests are not supported on Android Yet. Bug 1566168.
+    testsToRun.wss = false;
+    testsToRun.mailto = false;
+  }
+
   function log(msg) {
     document.getElementById("log").textContent += "\n" + msg;
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/xhr/XMLHttpRequestMainThread.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/xhr/XMLHttpRequestMainThread.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/xhr/XMLHttpRequestMainThread.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/xhr/XMLHttpRequestMainThread.cpp	2019-09-15 11:33:09.000000000 +0000
@@ -2404,6 +2404,8 @@
     rv = httpChannel->SetRequestMethod(mRequestMethod);
     NS_ENSURE_SUCCESS(rv, rv);
 
+    httpChannel->SetSource(profiler_get_backtrace());
+
     // Set the initiator type
     nsCOMPtr<nsITimedChannel> timedChannel(do_QueryInterface(httpChannel));
     if (timedChannel) {
@@ -3120,6 +3122,17 @@
   mOriginStack = std::move(aOriginStack);
 }
 
+void XMLHttpRequestMainThread::SetSource(UniqueProfilerBacktrace aSource) {
+  if (!mChannel) {
+    return;
+  }
+  nsCOMPtr<nsIHttpChannel> httpChannel = do_QueryInterface(mChannel);
+
+  if (httpChannel) {
+    httpChannel->SetSource(std::move(aSource));
+  }
+}
+
 bool XMLHttpRequestMainThread::WithCredentials() const {
   return mFlagACwithCredentials;
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/xhr/XMLHttpRequestMainThread.h firefox-trunk-71.0~a1~hg20190915r493291/dom/xhr/XMLHttpRequestMainThread.h
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/xhr/XMLHttpRequestMainThread.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/xhr/XMLHttpRequestMainThread.h	2019-09-15 11:33:10.000000000 +0000
@@ -391,6 +391,8 @@
 
   void SetOriginStack(UniquePtr<SerializedStackHolder> aOriginStack);
 
+  void SetSource(UniqueProfilerBacktrace aSource);
+
   virtual uint16_t ErrorCode() const override {
     return static_cast<uint16_t>(mErrorLoad);
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/dom/xhr/XMLHttpRequestWorker.cpp firefox-trunk-71.0~a1~hg20190915r493291/dom/xhr/XMLHttpRequestWorker.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/dom/xhr/XMLHttpRequestWorker.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/dom/xhr/XMLHttpRequestWorker.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -671,6 +671,10 @@
   // be passed on to the net monitor.
   UniquePtr<SerializedStackHolder> mOriginStack;
 
+  // Remember the worker thread's stack when the XHR was opened for profiling
+  // purposes.
+  UniqueProfilerBacktrace mSource;
+
  public:
   OpenRunnable(WorkerPrivate* aWorkerPrivate, Proxy* aProxy,
                const nsACString& aMethod, const nsAString& aURL,
@@ -679,7 +683,8 @@
                bool aWithCredentials, uint32_t aTimeout,
                XMLHttpRequestResponseType aResponseType,
                const nsString& aMimeTypeOverride,
-               UniquePtr<SerializedStackHolder> aOriginStack)
+               UniquePtr<SerializedStackHolder> aOriginStack,
+               UniqueProfilerBacktrace aSource = nullptr)
       : WorkerThreadProxySyncRunnable(aWorkerPrivate, aProxy),
         mMethod(aMethod),
         mURL(aURL),
@@ -688,7 +693,8 @@
         mTimeout(aTimeout),
         mResponseType(aResponseType),
         mMimeTypeOverride(aMimeTypeOverride),
-        mOriginStack(std::move(aOriginStack)) {
+        mOriginStack(std::move(aOriginStack)),
+        mSource(std::move(aSource)) {
     if (aUser.WasPassed()) {
       mUserStr = aUser.Value();
       mUser = &mUserStr;
@@ -1322,6 +1328,10 @@
     return rv.StealNSResult();
   }
 
+  if (mSource) {
+    mProxy->mXHR->SetSource(std::move(mSource));
+  }
+
   mProxy->mXHR->SetResponseType(mResponseType, rv);
   if (NS_WARN_IF(rv.Failed())) {
     return rv.StealNSResult();
@@ -1796,8 +1806,8 @@
   RefPtr<OpenRunnable> runnable = new OpenRunnable(
       mWorkerPrivate, mProxy, aMethod, aUrl, aUser, aPassword,
       mBackgroundRequest, mWithCredentials, mTimeout, mResponseType,
-      alsoOverrideMimeType ? mMimeTypeOverride : VoidString(),
-      std::move(stack));
+      alsoOverrideMimeType ? mMimeTypeOverride : VoidString(), std::move(stack),
+      profiler_get_backtrace());
 
   ++mProxy->mOpenCount;
   runnable->Dispatch(Canceling, aRv);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/EditorBase.h firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/EditorBase.h
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/EditorBase.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/EditorBase.h	2019-09-15 11:33:10.000000000 +0000
@@ -507,10 +507,6 @@
     return (mFlags & nsIPlaintextEditor::eEditorAllowInteraction) != 0;
   }
 
-  bool DontEchoPassword() const {
-    return (mFlags & nsIPlaintextEditor::eEditorDontEchoPassword) != 0;
-  }
-
   bool ShouldSkipSpellCheck() const {
     return (mFlags & nsIPlaintextEditor::eEditorSkipSpellCheck) != 0;
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/HTMLEditor.cpp firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/HTMLEditor.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/HTMLEditor.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/HTMLEditor.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -1521,7 +1521,7 @@
         // calls DeleteSelection with aStripWrappers = eStrip.
         rv = DeleteSelectionAsSubAction(eNone, eNoStrip);
         if (NS_WARN_IF(NS_FAILED(rv))) {
-          return rv;
+          return EditorBase::ToGenericNSResult(rv);
         }
       }
 
@@ -4150,142 +4150,161 @@
 
   CommitComposition();
 
-  // Protect the edit rules object from dying
-  RefPtr<TextEditRules> rules(mRules);
+  // XXX Shouldn't we do this before calling `CommitComposition()`?
+  if (IsPlaintextEditor()) {
+    return NS_OK;
+  }
 
-  bool isCollapsed = SelectionRefPtr()->IsCollapsed();
+  EditActionResult result = CanHandleHTMLEditSubAction();
+  if (NS_WARN_IF(result.Failed()) || result.Canceled()) {
+    return result.Rv();
+  }
+
+  bool selectionIsCollapsed = SelectionRefPtr()->IsCollapsed();
 
   AutoPlaceholderBatch treatAsOneTransaction(*this);
   AutoEditSubActionNotifier startToHandleEditSubAction(
       *this, EditSubAction::eInsertElement, nsIEditor::eNext);
-  AutoSelectionRestorer restoreSelectionLater(*this);
-  AutoTransactionsConserveSelection dontChangeMySelection(*this);
 
-  // XXX Although, this method may set background color of ancestor block
-  //     element, using EditSubAction::eSetTextProperty.
-  bool cancel, handled;
-  EditSubActionInfo subActionInfo(EditSubAction::eSetTextProperty);
-  nsresult rv = rules->WillDoAction(subActionInfo, &cancel, &handled);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  if (!cancel && !handled) {
+  {
+    AutoSelectionRestorer restoreSelectionLater(*this);
+    AutoTransactionsConserveSelection dontChangeMySelection(*this);
+
     // Loop through the ranges in the selection
+    // XXX This is different from `SetInlinePropertyInternal()`.  It uses
+    //     AutoRangeArray to store all ranges first.  The result may be
+    //     different if mutation event listener changes the `Selection`.
     for (uint32_t i = 0; i < SelectionRefPtr()->RangeCount(); i++) {
       RefPtr<nsRange> range = SelectionRefPtr()->GetRangeAt(i);
       if (NS_WARN_IF(!range)) {
         return NS_ERROR_FAILURE;
       }
 
-      nsCOMPtr<Element> cachedBlockParent;
+      EditorDOMPoint startOfRange(range->StartRef());
+      EditorDOMPoint endOfRange(range->EndRef());
+      if (NS_WARN_IF(!startOfRange.IsSet()) ||
+          NS_WARN_IF(!endOfRange.IsSet())) {
+        continue;
+      }
 
-      // Check for easy case: both range endpoints in same text node
-      nsCOMPtr<nsINode> startNode = range->GetStartContainer();
-      int32_t startOffset = range->StartOffset();
-      nsCOMPtr<nsINode> endNode = range->GetEndContainer();
-      int32_t endOffset = range->EndOffset();
-      if (startNode == endNode && IsTextNode(startNode)) {
-        // Let's find the block container of the text node
-        nsCOMPtr<Element> blockParent = GetBlockNodeParent(startNode);
-        // And apply the background color to that block container
-        if (blockParent && cachedBlockParent != blockParent) {
-          cachedBlockParent = blockParent;
-          mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
-              blockParent, nullptr, nsGkAtoms::bgcolor, &aColor, false);
-        }
-      } else if (startNode == endNode &&
-                 startNode->IsHTMLElement(nsGkAtoms::body) && isCollapsed) {
-        // No block in the document, let's apply the background to the body
-        mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
-            MOZ_KnownLive(startNode->AsElement()), nullptr, nsGkAtoms::bgcolor,
-            &aColor, false);
-      } else if (startNode == endNode && (endOffset - startOffset == 1 ||
-                                          (!startOffset && !endOffset))) {
-        // A unique node is selected, let's also apply the background color to
-        // the containing block, possibly the node itself
-        nsCOMPtr<nsIContent> selectedNode = range->GetChildAtStartOffset();
-        nsCOMPtr<Element> blockParent = GetBlock(*selectedNode);
-        if (blockParent && cachedBlockParent != blockParent) {
-          cachedBlockParent = blockParent;
-          mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
-              blockParent, nullptr, nsGkAtoms::bgcolor, &aColor, false);
+      if (startOfRange.GetContainer() == endOfRange.GetContainer()) {
+        // If the range is in a text node, set background color of its parent
+        // block.
+        if (startOfRange.IsInTextNode()) {
+          if (RefPtr<Element> blockParent =
+                  GetBlockNodeParent(startOfRange.GetContainer())) {
+            mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
+                blockParent, nullptr, nsGkAtoms::bgcolor, &aColor, false);
+            if (NS_WARN_IF(Destroyed())) {
+              return NS_ERROR_EDITOR_DESTROYED;
+            }
+          }
+          continue;
         }
-      } else {
-        // Not the easy case.  Range not contained in single text node.  There
-        // are up to three phases here.  There are all the nodes reported by
-        // the subtree iterator to be processed.  And there are potentially a
-        // starting textnode and an ending textnode which are only partially
-        // contained by the range.
-
-        // Let's handle the nodes reported by the iterator.  These nodes are
-        // entirely contained in the selection range.  We build up a list of
-        // them (since doing operations on the document during iteration would
-        // perturb the iterator).
-
-        nsTArray<OwningNonNull<nsINode>> arrayOfNodes;
-        nsCOMPtr<nsINode> node;
-
-        // Iterate range and build up array
-        ContentSubtreeIterator subtreeIter;
-        rv = subtreeIter.Init(range);
-        // Init returns an error if no nodes in range.  This can easily happen
-        // with the subtree iterator if the selection doesn't contain any
-        // *whole* nodes.
-        if (NS_SUCCEEDED(rv)) {
-          for (; !subtreeIter.IsDone(); subtreeIter.Next()) {
-            node = subtreeIter.GetCurrentNode();
-            NS_ENSURE_TRUE(node, NS_ERROR_FAILURE);
 
-            if (IsEditable(node)) {
-              arrayOfNodes.AppendElement(*node);
-            }
+        // If `Selection` is collapsed in a `<body>` element, set background
+        // color of the `<body>` element.
+        // XXX Why do we refer whether the `Selection` is collapsed rather
+        //     than the `nsRange` is collapsed?
+        if (startOfRange.GetContainer()->IsHTMLElement(nsGkAtoms::body) &&
+            selectionIsCollapsed) {
+          mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
+              MOZ_KnownLive(startOfRange.GetContainerAsElement()), nullptr,
+              nsGkAtoms::bgcolor, &aColor, false);
+          if (NS_WARN_IF(Destroyed())) {
+            return NS_ERROR_EDITOR_DESTROYED;
           }
+          continue;
         }
-        // First check the start parent of the range to see if it needs to be
-        // separately handled (it does if it's a text node, due to how the
-        // subtree iterator works - it will not have reported it).
-        if (IsTextNode(startNode) && IsEditable(startNode)) {
-          nsCOMPtr<Element> blockParent = GetBlockNodeParent(startNode);
-          if (blockParent && cachedBlockParent != blockParent) {
-            cachedBlockParent = blockParent;
+        // If one node is selected, set background color of it if it's a
+        // block, or of its parent block otherwise.
+        if ((startOfRange.IsStartOfContainer() &&
+             endOfRange.IsStartOfContainer()) ||
+            startOfRange.Offset() + 1 == endOfRange.Offset()) {
+          if (NS_WARN_IF(startOfRange.IsInDataNode())) {
+            continue;
+          }
+          if (RefPtr<Element> blockParent =
+                  GetBlock(*startOfRange.GetChild())) {
             mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
                 blockParent, nullptr, nsGkAtoms::bgcolor, &aColor, false);
+            if (NS_WARN_IF(Destroyed())) {
+              return NS_ERROR_EDITOR_DESTROYED;
+            }
           }
+          continue;
         }
+      }
 
-        // Then loop through the list, set the property on each node
-        for (auto& node : arrayOfNodes) {
-          nsCOMPtr<Element> blockParent = GetBlock(node);
-          if (blockParent && cachedBlockParent != blockParent) {
-            cachedBlockParent = blockParent;
-            mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
-                blockParent, nullptr, nsGkAtoms::bgcolor, &aColor, false);
+      // Collect editable nodes which are entirely contained in the range.
+      AutoTArray<OwningNonNull<nsIContent>, 64> arrayOfContents;
+      ContentSubtreeIterator subtreeIter;
+      // If there is no node which is entirely in the range,
+      // `ContentSubtreeIterator::Init()` fails, but this is possible case,
+      // don't warn it.
+      if (NS_SUCCEEDED(subtreeIter.Init(range))) {
+        for (; !subtreeIter.IsDone(); subtreeIter.Next()) {
+          nsINode* node = subtreeIter.GetCurrentNode();
+          if (NS_WARN_IF(!node)) {
+            return NS_ERROR_FAILURE;
+          }
+          if (node->IsContent() && IsEditable(node)) {
+            arrayOfContents.AppendElement(*node->AsContent());
           }
         }
-        arrayOfNodes.Clear();
+      }
 
-        // Last, check the end parent of the range to see if it needs to be
-        // separately handled (it does if it's a text node, due to how the
-        // subtree iterator works - it will not have reported it).
-        if (IsTextNode(endNode) && IsEditable(endNode)) {
-          nsCOMPtr<Element> blockParent = GetBlockNodeParent(endNode);
-          if (blockParent && cachedBlockParent != blockParent) {
-            cachedBlockParent = blockParent;
-            mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
-                blockParent, nullptr, nsGkAtoms::bgcolor, &aColor, false);
+      // This caches block parent if we set its background color.
+      RefPtr<Element> handledBlockParent;
+
+      // If start node is a text node, set background color of its parent
+      // block.
+      if (startOfRange.IsInTextNode() &&
+          IsEditable(startOfRange.GetContainer())) {
+        RefPtr<Element> blockParent =
+            GetBlockNodeParent(startOfRange.GetContainer());
+        if (blockParent && handledBlockParent != blockParent) {
+          handledBlockParent = blockParent;
+          mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
+              blockParent, nullptr, nsGkAtoms::bgcolor, &aColor, false);
+          if (NS_WARN_IF(Destroyed())) {
+            return NS_ERROR_EDITOR_DESTROYED;
+          }
+        }
+      }
+
+      // Then, set background color of each block or block parent of all nodes
+      // in the range entirely.
+      for (auto& content : arrayOfContents) {
+        RefPtr<Element> blockParent = GetBlock(content);
+        if (blockParent && handledBlockParent != blockParent) {
+          handledBlockParent = blockParent;
+          mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
+              blockParent, nullptr, nsGkAtoms::bgcolor, &aColor, false);
+          if (NS_WARN_IF(Destroyed())) {
+            return NS_ERROR_EDITOR_DESTROYED;
+          }
+        }
+      }
+
+      // Finally, if end node is a text node, set background color of its
+      // parent block.
+      if (endOfRange.IsInTextNode() && IsEditable(endOfRange.GetContainer())) {
+        RefPtr<Element> blockParent =
+            GetBlockNodeParent(endOfRange.GetContainer());
+        if (blockParent && handledBlockParent != blockParent) {
+          mCSSEditUtils->SetCSSEquivalentToHTMLStyle(
+              blockParent, nullptr, nsGkAtoms::bgcolor, &aColor, false);
+          if (NS_WARN_IF(Destroyed())) {
+            return NS_ERROR_EDITOR_DESTROYED;
           }
         }
       }
     }
   }
-  if (!cancel) {
-    // Post-process
-    rv = rules->DidDoAction(subActionInfo, rv);
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
-  }
-  return NS_OK;
+
+  // Restoring `Selection` may cause destroying us.
+  return NS_WARN_IF(Destroyed()) ? NS_ERROR_EDITOR_DESTROYED : NS_OK;
 }
 
 NS_IMETHODIMP
@@ -4307,8 +4326,10 @@
     // if we are in CSS mode, we have to apply the background color to the
     // containing block (or the body if we have no block-level element in
     // the document)
-    return EditorBase::ToGenericNSResult(
-        SetCSSBackgroundColorWithTransaction(aColor));
+    nsresult rv = SetCSSBackgroundColorWithTransaction(aColor);
+    NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
+                         "SetCSSBackgroundColorWithTransaction() failed");
+    return EditorBase::ToGenericNSResult(rv);
   }
 
   // but in HTML mode, we can only set the document's background color
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/HTMLEditor.h firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/HTMLEditor.h
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/HTMLEditor.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/HTMLEditor.h	2019-09-15 11:33:10.000000000 +0000
@@ -1166,22 +1166,14 @@
   MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult WillInsert(bool* aCancel = nullptr);
 
   /**
-   * Called before inserting text.
-   * This method may actually inserts text into the editor.  Therefore, this
-   * might cause destroying the editor.
-   *
-   * @param aEditSubAction      Must be EditSubAction::eInsertTextComingFromIME
-   *                            or EditSubAction::eInsertText.
-   * @param aCancel             Returns true if the operation is canceled.
-   * @param aHandled            Returns true if the edit action is handled.
-   * @param inString            String to be inserted.
-   * @param outString           String actually inserted.
-   * @param aMaxLength          The maximum string length which the editor
-   *                            allows to set.
-   */
-  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult WillInsertText(
-      EditSubAction aEditSubAction, bool* aCancel, bool* aHandled,
-      const nsAString* inString, nsAString* outString, int32_t aMaxLength);
+   * HandleInsertText() handles inserting text at selection.
+   *
+   * @param aEditSubAction      Must be EditSubAction::eInsertText or
+   *                            EditSubAction::eInsertTextComingFromIME.
+   * @param aInsertionString    String to be inserted at selection.
+   */
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE virtual EditActionResult HandleInsertText(
+      EditSubAction aEditSubAction, const nsAString& aInsertionString) final;
 
   /**
    * GetInlineStyles() retrieves the style of aNode and modifies each item of
@@ -2265,14 +2257,29 @@
   DeleteElementsExceptTableRelatedElements(nsINode& aNode);
 
   /**
+   * HandleDeleteSelectionInternal() is a helper method of
+   * HandleDeleteSelection().  This can be called recursively by the helper
+   * methods.
+   * NOTE: This method creates SelectionBatcher.  Therefore, each caller
+   *       needs to check if the editor is still available even if this returns
+   *       NS_OK.
+   */
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE EditActionResult
+  HandleDeleteSelectionInternal(nsIEditor::EDirection aDirectionAndAmount,
+                                nsIEditor::EStripWrappers aStripWrappers);
+
+  /**
    * This method handles "delete selection" commands.
+   * NOTE: Don't call this method recursively from the helper methods since
+   *       when nobody handled it without canceling and returing an error,
+   *       this falls it back to `DeleteSelectionWithTransaction()`.
    *
    * @param aDirectionAndAmount Direction of the deletion.
    * @param aStripWrappers      Must be eStrip or eNoStrip.
    */
-  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE EditActionResult
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE virtual EditActionResult
   HandleDeleteSelection(nsIEditor::EDirection aDirectionAndAmount,
-                        nsIEditor::EStripWrappers aStripWrappers);
+                        nsIEditor::EStripWrappers aStripWrappers) final;
 
   /**
    * DeleteMostAncestorMailCiteElementIfEmpty() deletes most ancestor
@@ -3251,11 +3258,33 @@
   MOZ_CAN_RUN_SCRIPT
   nsresult LoadHTML(const nsAString& aInputString);
 
-  MOZ_CAN_RUN_SCRIPT
-  nsresult SetInlinePropertyInternal(nsAtom& aProperty, nsAtom* aAttribute,
-                                     const nsAString& aValue);
-  MOZ_CAN_RUN_SCRIPT
-  nsresult RemoveInlinePropertyInternal(nsAtom* aProperty, nsAtom* aAttribute);
+  /**
+   * SetInlinePropertyInternal() stores new style with `mTypeInState` if
+   * `Selection` is collapsed.  Otherwise, applying the style at all selection
+   * ranges.
+   *
+   * @param aProperty           One of the presentation tag names which we
+   *                            support in style editor.
+   * @param aAttribute          For some aProperty values, needs to be set to
+   *                            its attribute name.  Otherwise, nullptr.
+   * @param aAttributeValue     The value of aAttribute.
+   */
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult SetInlinePropertyInternal(
+      nsAtom& aProperty, nsAtom* aAttribute, const nsAString& aValue);
+
+  /**
+   * RemoveInlinePropertyInternal() removes specified style from `mTypeInState`
+   * if `Selection` is collapsed.  Otherwise, removing the style.
+   * XXX Looks like that this has a lot of bugs in HTML mode.
+   *
+   * @param aProperty           nullptr if you want to remove all inline styles.
+   *                            Otherwise, one of the presentation tag names
+   *                            which we support in style editor.
+   * @param aAttribute          For some aProperty values, need to be set to
+   *                            its attribute name.  Otherwise, nullptr.
+   */
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult
+  RemoveInlinePropertyInternal(nsAtom* aProperty, nsAtom* aAttribute);
 
   /**
    * ReplaceHeadContentsWithSourceWithTransaction() replaces all children of
@@ -3280,10 +3309,10 @@
    * This sets background on the appropriate container element (table, cell,)
    * or calls into nsTextEditor to set the page background.
    */
-  MOZ_CAN_RUN_SCRIPT
-  nsresult SetCSSBackgroundColorWithTransaction(const nsAString& aColor);
-  MOZ_CAN_RUN_SCRIPT
-  nsresult SetHTMLBackgroundColorWithTransaction(const nsAString& aColor);
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult
+  SetCSSBackgroundColorWithTransaction(const nsAString& aColor);
+  MOZ_CAN_RUN_SCRIPT nsresult
+  SetHTMLBackgroundColorWithTransaction(const nsAString& aColor);
 
   virtual void InitializeSelectionAncestorLimit(
       nsIContent& aAncestorLimit) override;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/HTMLEditRules.cpp firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/HTMLEditRules.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/HTMLEditRules.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/HTMLEditRules.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -754,12 +754,6 @@
   *aCancel = false;
   *aHandled = false;
 
-  // Deal with actions for which we don't need to check whether the selection is
-  // editable.
-  if (aInfo.mEditSubAction == EditSubAction::eComputeTextToOutput) {
-    return TextEditRules::WillDoAction(aInfo, aCancel, aHandled);
-  }
-
   AutoSafeEditorData setData(*this, *mHTMLEditor);
 
   EditActionResult result = HTMLEditorRef().CanHandleHTMLEditSubAction();
@@ -777,21 +771,6 @@
   }
 
   switch (aInfo.mEditSubAction) {
-    case EditSubAction::eInsertText:
-    case EditSubAction::eInsertTextComingFromIME:
-      TextEditorRef().UndefineCaretBidiLevel();
-      return MOZ_KnownLive(HTMLEditorRef())
-          .WillInsertText(aInfo.mEditSubAction, aCancel, aHandled,
-                          aInfo.inString, aInfo.outString, aInfo.maxLength);
-    case EditSubAction::eDeleteSelectedContent:
-      result = MOZ_KnownLive(HTMLEditorRef())
-                   .HandleDeleteSelection(aInfo.collapsedAction,
-                                          aInfo.stripWrappers);
-      *aHandled = result.Handled();
-      *aCancel = result.Canceled();
-      NS_WARNING_ASSERTION(result.Succeeded(),
-                           "HandleDeleteSelection() failed");
-      return result.Rv();
     case EditSubAction::eInsertElement:
     case EditSubAction::eInsertQuotedText: {
       nsresult rv = MOZ_KnownLive(HTMLEditorRef()).WillInsert(aCancel);
@@ -801,21 +780,27 @@
       NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "WillInsert() failed");
       return NS_OK;
     }
+    case EditSubAction::eComputeTextToOutput:
     case EditSubAction::eCreateOrChangeDefinitionListItem:
     case EditSubAction::eCreateOrChangeList:
     case EditSubAction::eCreateOrRemoveBlock:
     case EditSubAction::eDecreaseZIndex:
+    case EditSubAction::eDeleteSelectedContent:
     case EditSubAction::eIncreaseZIndex:
     case EditSubAction::eIndent:
     case EditSubAction::eInsertHTMLSource:
     case EditSubAction::eInsertParagraphSeparator:
+    case EditSubAction::eInsertText:
+    case EditSubAction::eInsertTextComingFromIME:
     case EditSubAction::eOutdent:
     case EditSubAction::eUndo:
     case EditSubAction::eRedo:
     case EditSubAction::eRemoveList:
+    case EditSubAction::eRemoveTextProperty:
     case EditSubAction::eSetOrClearAlignment:
     case EditSubAction::eSetPositionToAbsolute:
     case EditSubAction::eSetPositionToStatic:
+    case EditSubAction::eSetTextProperty:
       MOZ_ASSERT_UNREACHABLE("This path should've been dead code");
       return NS_ERROR_UNEXPECTED;
     default:
@@ -832,12 +817,10 @@
   AutoSafeEditorData setData(*this, *mHTMLEditor);
 
   switch (aInfo.mEditSubAction) {
-    case EditSubAction::eInsertText:
-    case EditSubAction::eInsertTextComingFromIME:
-      return NS_OK;
     case EditSubAction::eInsertElement:
     case EditSubAction::eInsertQuotedText:
       return NS_OK;
+    case EditSubAction::eComputeTextToOutput:
     case EditSubAction::eCreateOrChangeDefinitionListItem:
     case EditSubAction::eCreateOrChangeList:
     case EditSubAction::eCreateOrRemoveBlock:
@@ -848,13 +831,17 @@
     case EditSubAction::eInsertHTMLSource:
     case EditSubAction::eInsertLineBreak:
     case EditSubAction::eInsertParagraphSeparator:
+    case EditSubAction::eInsertText:
+    case EditSubAction::eInsertTextComingFromIME:
     case EditSubAction::eOutdent:
     case EditSubAction::eUndo:
     case EditSubAction::eRedo:
     case EditSubAction::eRemoveList:
+    case EditSubAction::eRemoveTextProperty:
     case EditSubAction::eSetOrClearAlignment:
     case EditSubAction::eSetPositionToAbsolute:
     case EditSubAction::eSetPositionToStatic:
+    case EditSubAction::eSetTextProperty:
       MOZ_ASSERT_UNREACHABLE("This path should've been dead code");
       return NS_ERROR_UNEXPECTED;
     default:
@@ -1379,47 +1366,44 @@
   return NS_OK;
 }
 
-nsresult HTMLEditor::WillInsertText(EditSubAction aEditSubAction, bool* aCancel,
-                                    bool* aHandled, const nsAString* inString,
-                                    nsAString* outString, int32_t aMaxLength) {
+EditActionResult HTMLEditor::HandleInsertText(
+    EditSubAction aEditSubAction, const nsAString& aInsertionString) {
   MOZ_ASSERT(IsTopLevelEditSubActionDataAvailable());
+  MOZ_ASSERT(aEditSubAction == EditSubAction::eInsertText ||
+             aEditSubAction == EditSubAction::eInsertTextComingFromIME);
 
-  if (NS_WARN_IF(!aCancel) || NS_WARN_IF(!aHandled)) {
-    return NS_ERROR_NULL_POINTER;
+  EditActionResult result = CanHandleHTMLEditSubAction();
+  if (NS_WARN_IF(result.Failed()) || result.Canceled()) {
+    return result;
   }
 
-  // initialize out param
-  *aCancel = false;
-  *aHandled = true;
+  UndefineCaretBidiLevel();
+
   // If the selection isn't collapsed, delete it.  Don't delete existing inline
   // tags, because we're hopefully going to insert text (bug 787432).
   if (!SelectionRefPtr()->IsCollapsed()) {
     nsresult rv =
         DeleteSelectionAsSubAction(nsIEditor::eNone, nsIEditor::eNoStrip);
-    if (NS_WARN_IF(Destroyed())) {
-      return NS_ERROR_EDITOR_DESTROYED;
-    }
     if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+      return EditActionHandled(rv);
     }
   }
 
   // FYI: Ignore cancel result of WillInsert().
   nsresult rv = WillInsert();
   if (NS_WARN_IF(rv == NS_ERROR_EDITOR_DESTROYED)) {
-    return NS_ERROR_EDITOR_DESTROYED;
+    return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
   }
   NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "WillInsert() failed");
 
-  // we need to get the doc
-  RefPtr<Document> doc = GetDocument();
-  if (NS_WARN_IF(!doc)) {
-    return NS_ERROR_FAILURE;
+  RefPtr<Document> document = GetDocument();
+  if (NS_WARN_IF(!document)) {
+    return EditActionHandled(NS_ERROR_FAILURE);
   }
 
   RefPtr<nsRange> firstRange = SelectionRefPtr()->GetRangeAt(0);
   if (NS_WARN_IF(!firstRange)) {
-    return NS_ERROR_FAILURE;
+    return EditActionHandled(NS_ERROR_FAILURE);
   }
 
   // for every property that is set, insert a new inline style node
@@ -1427,24 +1411,24 @@
   //     it should just return the insertion point instead.
   rv = CreateStyleForInsertText(*firstRange);
   if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    return EditActionHandled(rv);
   }
 
   firstRange = SelectionRefPtr()->GetRangeAt(0);
   if (NS_WARN_IF(!firstRange)) {
-    return NS_ERROR_FAILURE;
+    return EditActionHandled(NS_ERROR_FAILURE);
   }
 
   EditorDOMPoint pointToInsert(firstRange->StartRef());
   if (NS_WARN_IF(!pointToInsert.IsSet())) {
-    return NS_ERROR_FAILURE;
+    return EditActionHandled(NS_ERROR_FAILURE);
   }
   MOZ_ASSERT(pointToInsert.IsSetAndValid());
 
   // dont put text in places that can't have it
   if (!EditorBase::IsTextNode(pointToInsert.GetContainer()) &&
       !CanContainTag(*pointToInsert.GetContainer(), *nsGkAtoms::textTagName)) {
-    return NS_ERROR_FAILURE;
+    return EditActionHandled(NS_ERROR_FAILURE);
   }
 
   if (aEditSubAction == EditSubAction::eInsertTextComingFromIME) {
@@ -1453,17 +1437,18 @@
       compositionStartPoint = pointToInsert;
     }
 
-    if (inString->IsEmpty()) {
+    if (aInsertionString.IsEmpty()) {
       // Right now the WSRunObject code bails on empty strings, but IME needs
       // the InsertTextWithTransaction() call to still happen since empty
       // strings are meaningful there.
-      rv = InsertTextWithTransaction(*doc, *inString, compositionStartPoint);
+      nsresult rv = InsertTextWithTransaction(*document, aInsertionString,
+                                              compositionStartPoint);
       if (NS_WARN_IF(Destroyed())) {
-        return NS_ERROR_EDITOR_DESTROYED;
+        return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
       }
       NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
                            "InsertTextWithTransaction() failed");
-      return rv;
+      return EditActionHandled(rv);
     }
 
     EditorRawDOMPoint compositionEndPoint = GetCompositionEndPoint();
@@ -1471,12 +1456,12 @@
       compositionEndPoint = compositionStartPoint;
     }
     WSRunObject wsObj(this, compositionStartPoint, compositionEndPoint);
-    rv = wsObj.InsertText(*doc, *inString);
+    nsresult rv = wsObj.InsertText(*document, aInsertionString);
     if (NS_WARN_IF(Destroyed())) {
-      return NS_ERROR_EDITOR_DESTROYED;
+      return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
     }
     if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+      return EditActionHandled(rv);
     }
 
     compositionStartPoint = GetCompositionStartPoint();
@@ -1484,14 +1469,14 @@
     if (NS_WARN_IF(!compositionStartPoint.IsSet()) ||
         NS_WARN_IF(!compositionEndPoint.IsSet())) {
       // Mutation event listener has changed the DOM tree...
-      return NS_OK;
+      return EditActionHandled();
     }
     rv = TopLevelEditSubActionDataRef().mChangedRange->SetStartAndEnd(
         compositionStartPoint.ToRawRangeBoundary(),
         compositionEndPoint.ToRawRangeBoundary());
     NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
                          "Faliled to set mChangedRange to composing range");
-    return rv;
+    return EditActionHandled(rv);
   }
 
   MOZ_ASSERT(aEditSubAction == EditSubAction::eInsertText);
@@ -1513,8 +1498,6 @@
 
   // don't change my selection in subtransactions
   AutoTransactionsConserveSelection dontChangeMySelection(*this);
-  nsAutoString tString(*inString);
-  const char16_t* unicodeBuf = tString.get();
   int32_t pos = 0;
   NS_NAMED_LITERAL_STRING(newlineStr, LFSTR);
 
@@ -1525,11 +1508,11 @@
     // its a lot cheaper to search the input string for only newlines than
     // it is to search for both tabs and newlines.
     if (isPRE || IsPlaintextEditor()) {
-      while (unicodeBuf && pos != -1 &&
-             pos < static_cast<int32_t>(inString->Length())) {
+      while (pos != -1 &&
+             pos < static_cast<int32_t>(aInsertionString.Length())) {
         int32_t oldPos = pos;
         int32_t subStrLen;
-        pos = tString.FindChar(nsCRT::LF, oldPos);
+        pos = aInsertionString.FindChar(nsCRT::LF, oldPos);
 
         if (pos != -1) {
           subStrLen = pos - oldPos;
@@ -1538,21 +1521,21 @@
             subStrLen = 1;
           }
         } else {
-          subStrLen = tString.Length() - oldPos;
-          pos = tString.Length();
+          subStrLen = aInsertionString.Length() - oldPos;
+          pos = aInsertionString.Length();
         }
 
-        nsDependentSubstring subStr(tString, oldPos, subStrLen);
+        nsDependentSubstring subStr(aInsertionString, oldPos, subStrLen);
 
         // is it a return?
         if (subStr.Equals(newlineStr)) {
           RefPtr<Element> brElement =
               InsertBRElementWithTransaction(currentPoint, nsIEditor::eNone);
           if (NS_WARN_IF(Destroyed())) {
-            return NS_ERROR_EDITOR_DESTROYED;
+            return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
           }
           if (NS_WARN_IF(!brElement)) {
-            return NS_ERROR_FAILURE;
+            return EditActionHandled(NS_ERROR_FAILURE);
           }
           pos++;
           if (brElement->GetNextSibling()) {
@@ -1573,14 +1556,14 @@
                                "by mutation observer");
         } else {
           EditorRawDOMPoint pointAfterInsertedString;
-          rv = InsertTextWithTransaction(*doc, subStr,
-                                         EditorRawDOMPoint(currentPoint),
-                                         &pointAfterInsertedString);
+          nsresult rv = InsertTextWithTransaction(
+              *document, subStr, EditorRawDOMPoint(currentPoint),
+              &pointAfterInsertedString);
           if (NS_WARN_IF(Destroyed())) {
-            return NS_ERROR_EDITOR_DESTROYED;
+            return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
           }
           if (NS_WARN_IF(NS_FAILED(rv))) {
-            return rv;
+            return EditActionHandled(rv);
           }
           currentPoint = pointAfterInsertedString;
           pointToInsert = pointAfterInsertedString;
@@ -1590,11 +1573,12 @@
       NS_NAMED_LITERAL_STRING(tabStr, "\t");
       NS_NAMED_LITERAL_STRING(spacesStr, "    ");
       char specialChars[] = {TAB, nsCRT::LF, 0};
-      while (unicodeBuf && pos != -1 &&
-             pos < static_cast<int32_t>(inString->Length())) {
+      nsAutoString insertionString(aInsertionString);  // For FindCharInSet().
+      while (pos != -1 &&
+             pos < static_cast<int32_t>(insertionString.Length())) {
         int32_t oldPos = pos;
         int32_t subStrLen;
-        pos = tString.FindCharInSet(specialChars, oldPos);
+        pos = insertionString.FindCharInSet(specialChars, oldPos);
 
         if (pos != -1) {
           subStrLen = pos - oldPos;
@@ -1603,22 +1587,23 @@
             subStrLen = 1;
           }
         } else {
-          subStrLen = tString.Length() - oldPos;
-          pos = tString.Length();
+          subStrLen = insertionString.Length() - oldPos;
+          pos = insertionString.Length();
         }
 
-        nsDependentSubstring subStr(tString, oldPos, subStrLen);
+        nsDependentSubstring subStr(insertionString, oldPos, subStrLen);
         WSRunObject wsObj(this, currentPoint);
 
         // is it a tab?
         if (subStr.Equals(tabStr)) {
           EditorRawDOMPoint pointAfterInsertedSpaces;
-          rv = wsObj.InsertText(*doc, spacesStr, &pointAfterInsertedSpaces);
+          nsresult rv =
+              wsObj.InsertText(*document, spacesStr, &pointAfterInsertedSpaces);
           if (NS_WARN_IF(Destroyed())) {
-            return NS_ERROR_EDITOR_DESTROYED;
+            return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
           }
           if (NS_WARN_IF(NS_FAILED(rv))) {
-            return rv;
+            return EditActionHandled(rv);
           }
           pos++;
           MOZ_ASSERT(pointAfterInsertedSpaces.IsSet());
@@ -1631,10 +1616,10 @@
               wsObj.InsertBreak(MOZ_KnownLive(*SelectionRefPtr()), currentPoint,
                                 nsIEditor::eNone);
           if (NS_WARN_IF(Destroyed())) {
-            return NS_ERROR_EDITOR_DESTROYED;
+            return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
           }
           if (NS_WARN_IF(!newBRElement)) {
-            return NS_ERROR_FAILURE;
+            return EditActionHandled(NS_ERROR_FAILURE);
           }
           pos++;
           if (newBRElement->GetNextSibling()) {
@@ -1655,12 +1640,13 @@
               "Perhaps, newBRElement has been moved or removed unexpectedly");
         } else {
           EditorRawDOMPoint pointAfterInsertedString;
-          rv = wsObj.InsertText(*doc, subStr, &pointAfterInsertedString);
+          nsresult rv =
+              wsObj.InsertText(*document, subStr, &pointAfterInsertedString);
           if (NS_WARN_IF(Destroyed())) {
-            return NS_ERROR_EDITOR_DESTROYED;
+            return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
           }
           if (NS_WARN_IF(NS_FAILED(rv))) {
-            return rv;
+            return EditActionHandled(rv);
           }
           MOZ_ASSERT(pointAfterInsertedString.IsSet());
           currentPoint = pointAfterInsertedString;
@@ -1681,7 +1667,7 @@
     IgnoredErrorResult ignoredError;
     SelectionRefPtr()->Collapse(currentPoint, ignoredError);
     if (NS_WARN_IF(Destroyed())) {
-      return NS_ERROR_EDITOR_DESTROYED;
+      return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
     }
     NS_WARNING_ASSERTION(!ignoredError.Failed(),
                          "Failed to collapse at current point");
@@ -1690,15 +1676,15 @@
   // manually update the doc changed range so that AfterEdit will clean up
   // the correct portion of the document.
   if (currentPoint.IsSet()) {
-    rv = TopLevelEditSubActionDataRef().mChangedRange->SetStartAndEnd(
+    nsresult rv = TopLevelEditSubActionDataRef().mChangedRange->SetStartAndEnd(
         pointToInsert.ToRawRangeBoundary(), currentPoint.ToRawRangeBoundary());
     NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Failed to set mChangedRange");
-    return rv;
+    return EditActionHandled(rv);
   }
 
   rv = TopLevelEditSubActionDataRef().mChangedRange->CollapseTo(pointToInsert);
   NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Failed to collapse mChangedRange");
-  return rv;
+  return EditActionHandled(rv);
 }
 
 bool HTMLEditor::CanContainParagraph(Element& aElement) const {
@@ -1747,9 +1733,6 @@
   if (!SelectionRefPtr()->IsCollapsed()) {
     nsresult rv =
         DeleteSelectionAsSubAction(nsIEditor::eNone, nsIEditor::eStrip);
-    if (NS_WARN_IF(Destroyed())) {
-      return EditActionIgnored(NS_ERROR_EDITOR_DESTROYED);
-    }
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return EditActionIgnored(rv);
     }
@@ -2324,6 +2307,46 @@
   MOZ_ASSERT(aStripWrappers == nsIEditor::eStrip ||
              aStripWrappers == nsIEditor::eNoStrip);
 
+  EditActionResult result =
+      HandleDeleteSelectionInternal(aDirectionAndAmount, aStripWrappers);
+  if (NS_WARN_IF(result.Failed()) || result.Canceled()) {
+    return result;
+  }
+  if (!result.Handled()) {
+    // If it's just ignored, we should fall this back to
+    // `DeleteSelectionWithTransaction()`.
+    DebugOnly<nsresult> rvIgnored =
+        DeleteSelectionWithTransaction(aDirectionAndAmount, aStripWrappers);
+    if (NS_WARN_IF(Destroyed())) {
+      return EditActionResult(NS_ERROR_EDITOR_DESTROYED);
+    }
+    NS_WARNING_ASSERTION(
+        NS_SUCCEEDED(rvIgnored),
+        "DeleteSelectionWithTransaction() failed, but ignored");
+  }
+
+  EditorDOMPoint atNewStartOfSelection(
+      EditorBase::GetStartPoint(*SelectionRefPtr()));
+  if (NS_WARN_IF(!atNewStartOfSelection.IsSet())) {
+    return EditActionHandled(NS_ERROR_FAILURE);
+  }
+  if (atNewStartOfSelection.GetContainerAsContent()) {
+    nsresult rv = DeleteMostAncestorMailCiteElementIfEmpty(
+        MOZ_KnownLive(*atNewStartOfSelection.GetContainerAsContent()));
+    if (NS_WARN_IF(NS_FAILED(rv))) {
+      return EditActionHandled(rv);
+    }
+  }
+  return EditActionHandled();
+}
+
+EditActionResult HTMLEditor::HandleDeleteSelectionInternal(
+    nsIEditor::EDirection aDirectionAndAmount,
+    nsIEditor::EStripWrappers aStripWrappers) {
+  MOZ_ASSERT(IsEditActionDataAvailable());
+  MOZ_ASSERT(aStripWrappers == nsIEditor::eStrip ||
+             aStripWrappers == nsIEditor::eNoStrip);
+
   // Remember that we did a selection deletion.  Used by
   // CreateStyleForInsertText()
   TopLevelEditSubActionDataRef().mDidDeleteSelection = true;
@@ -2407,8 +2430,11 @@
       return EditActionResult(rv);
     }
 
-    // We should delete nothing.
     if (aDirectionAndAmount == nsIEditor::eNone) {
+      // If we're not called recursively, we should call
+      // `DeleteSelectionWithTransaction()` here, but we cannot detect it for
+      // now.  Therefore, we should just tell the caller of that we does
+      // nothing.
       return EditActionIgnored();
     }
 
@@ -2675,9 +2701,9 @@
     // XXX This nesting call is not safe.  If mutation event listener
     //     creates same situation, this causes stack-overflow.
     EditActionResult result =
-        HandleDeleteSelection(aDirectionAndAmount, aStripWrappers);
+        HandleDeleteSelectionInternal(aDirectionAndAmount, aStripWrappers);
     NS_WARNING_ASSERTION(result.Succeeded(),
-                         "Nested HandleDeleteSelection() failed");
+                         "Nested HandleDeleteSelectionInternal() failed");
     return result;
   }
 
@@ -2897,6 +2923,10 @@
   // Don't cross table boundaries
   if (leftNode && rightNode &&
       HTMLEditor::NodesInDifferentTableElements(*leftNode, *rightNode)) {
+    // If we have not deleted `<br>` element and are not called recursively,
+    // we should call `DeleteSelectionWithTransaction()` here, but we cannot
+    // detect it for now.  Therefore, we should just tell the caller of that
+    // we does nothing.
     return didBRElementDeleted ? EditActionHandled() : EditActionIgnored();
   }
 
@@ -2952,9 +2982,9 @@
     NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
                          "Selection::Collapse() failed, but ignored");
     EditActionResult result =
-        HandleDeleteSelection(aDirectionAndAmount, aStripWrappers);
+        HandleDeleteSelectionInternal(aDirectionAndAmount, aStripWrappers);
     NS_WARNING_ASSERTION(result.Succeeded(),
-                         "Nested HandleDeleteSelection() failed");
+                         "Nested HandleDeleteSelectionInternal() failed");
     return result;
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/HTMLStyleEditor.cpp firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/HTMLStyleEditor.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/HTMLStyleEditor.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/HTMLStyleEditor.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -100,10 +100,8 @@
     }
   }
   nsresult rv = SetInlinePropertyInternal(aProperty, aAttribute, aValue);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return EditorBase::ToGenericNSResult(rv);
-  }
-  return NS_OK;
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "SetInlinePropertyInternal() failed");
+  return EditorBase::ToGenericNSResult(rv);
 }
 
 NS_IMETHODIMP
@@ -135,138 +133,145 @@
       break;
   }
   nsresult rv = SetInlinePropertyInternal(*property, attribute, aValue);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return EditorBase::ToGenericNSResult(rv);
-  }
-  return NS_OK;
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "SetInlinePropertyInternal() failed");
+  return EditorBase::ToGenericNSResult(rv);
 }
 
-nsresult HTMLEditor::SetInlinePropertyInternal(nsAtom& aProperty,
-                                               nsAtom* aAttribute,
-                                               const nsAString& aValue) {
+nsresult HTMLEditor::SetInlinePropertyInternal(
+    nsAtom& aProperty, nsAtom* aAttribute, const nsAString& aAttributeValue) {
   MOZ_ASSERT(IsEditActionDataAvailable());
 
   if (NS_WARN_IF(!mRules)) {
     return NS_ERROR_NOT_INITIALIZED;
   }
 
-  RefPtr<TextEditRules> rules(mRules);
   CommitComposition();
 
   if (SelectionRefPtr()->IsCollapsed()) {
     // Manipulating text attributes on a collapsed selection only sets state
     // for the next text insertion
-    mTypeInState->SetProp(&aProperty, aAttribute, aValue);
+    mTypeInState->SetProp(&aProperty, aAttribute, aAttributeValue);
+    return NS_OK;
+  }
+
+  // XXX Shouldn't we return before calling `CommitComposition()`?
+  if (IsPlaintextEditor()) {
     return NS_OK;
   }
 
+  EditActionResult result = CanHandleHTMLEditSubAction();
+  if (NS_WARN_IF(result.Failed()) || result.Canceled()) {
+    return result.Rv();
+  }
+
   AutoPlaceholderBatch treatAsOneTransaction(*this);
   AutoEditSubActionNotifier startToHandleEditSubAction(
       *this, EditSubAction::eInsertElement, nsIEditor::eNext);
-  AutoSelectionRestorer restoreSelectionLater(*this);
-  AutoTransactionsConserveSelection dontChangeMySelection(*this);
 
-  bool cancel, handled;
-  EditSubActionInfo subActionInfo(EditSubAction::eSetTextProperty);
-  // Protect the edit rules object from dying
-  nsresult rv = rules->WillDoAction(subActionInfo, &cancel, &handled);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  if (!cancel && !handled) {
+  {
+    AutoSelectionRestorer restoreSelectionLater(*this);
+    AutoTransactionsConserveSelection dontChangeMySelection(*this);
+
     // Loop through the ranges in the selection
+    // XXX This is different from `SetCSSBackgroundColorWithTransaction()`.
+    //     It refers `Selection::GetRangeAt()` in each time.  The result may
+    //     be different if mutation event listener changes the `Selection`.
     AutoRangeArray arrayOfRanges(SelectionRefPtr());
     for (auto& range : arrayOfRanges.mRanges) {
       // Adjust range to include any ancestors whose children are entirely
       // selected
-      rv = PromoteInlineRange(*range);
+      nsresult rv = PromoteInlineRange(*range);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
 
-      // Check for easy case: both range endpoints in same text node
-      nsCOMPtr<nsINode> startNode = range->GetStartContainer();
-      nsCOMPtr<nsINode> endNode = range->GetEndContainer();
-      if (startNode && startNode == endNode && startNode->GetAsText()) {
-        rv = SetInlinePropertyOnTextNode(
-            MOZ_KnownLive(*startNode->GetAsText()), range->StartOffset(),
-            range->EndOffset(), aProperty, aAttribute, aValue);
+      // XXX Shouldn't we skip the range if it's been collapsed by mutation
+      //     event listener?
+
+      EditorDOMPoint startOfRange(range->StartRef());
+      EditorDOMPoint endOfRange(range->EndRef());
+      if (NS_WARN_IF(!startOfRange.IsSet()) ||
+          NS_WARN_IF(!endOfRange.IsSet())) {
+        continue;
+      }
+
+      // If range is in a text node, apply new style simply.
+      if (startOfRange.GetContainer() == endOfRange.GetContainer() &&
+          startOfRange.IsInTextNode()) {
+        nsresult rv = SetInlinePropertyOnTextNode(
+            MOZ_KnownLive(*startOfRange.GetContainerAsText()),
+            startOfRange.Offset(), endOfRange.Offset(), aProperty, aAttribute,
+            aAttributeValue);
+        if (NS_WARN_IF(Destroyed())) {
+          return NS_ERROR_EDITOR_DESTROYED;
+        }
         if (NS_WARN_IF(NS_FAILED(rv))) {
           return rv;
         }
         continue;
       }
 
-      // Not the easy case.  Range not contained in single text node.  There
-      // are up to three phases here.  There are all the nodes reported by the
-      // subtree iterator to be processed.  And there are potentially a
-      // starting textnode and an ending textnode which are only partially
-      // contained by the range.
-
-      // Let's handle the nodes reported by the iterator.  These nodes are
-      // entirely contained in the selection range.  We build up a list of them
-      // (since doing operations on the document during iteration would perturb
-      // the iterator).
-
-      nsTArray<OwningNonNull<nsIContent>> arrayOfNodes;
-
-      // Iterate range and build up array
+      // Collect editable nodes which are entirely contained in the range.
+      AutoTArray<OwningNonNull<nsIContent>, 64> arrayOfContents;
       ContentSubtreeIterator subtreeIter;
-      rv = subtreeIter.Init(range);
-      // Init returns an error if there are no nodes in range.  This can easily
-      // happen with the subtree iterator if the selection doesn't contain any
-      // *whole* nodes.
-      if (NS_SUCCEEDED(rv)) {
+      // If there is no node which is entirely in the range,
+      // `ContentSubtreeIterator::Init()` fails, but this is possible case,
+      // don't warn it.
+      if (NS_SUCCEEDED(subtreeIter.Init(range))) {
         for (; !subtreeIter.IsDone(); subtreeIter.Next()) {
-          OwningNonNull<nsINode> node = *subtreeIter.GetCurrentNode();
-
+          nsINode* node = subtreeIter.GetCurrentNode();
+          if (NS_WARN_IF(!node)) {
+            return NS_ERROR_FAILURE;
+          }
           if (node->IsContent() && IsEditable(node)) {
-            arrayOfNodes.AppendElement(*node->AsContent());
+            arrayOfContents.AppendElement(*node->AsContent());
           }
         }
       }
-      // First check the start parent of the range to see if it needs to be
-      // separately handled (it does if it's a text node, due to how the
-      // subtree iterator works - it will not have reported it).
-      if (startNode && startNode->GetAsText() && IsEditable(startNode)) {
-        rv = SetInlinePropertyOnTextNode(
-            MOZ_KnownLive(*startNode->GetAsText()), range->StartOffset(),
-            startNode->Length(), aProperty, aAttribute, aValue);
+
+      // If start node is a text node, apply new style to a part of it.
+      if (startOfRange.IsInTextNode() &&
+          IsEditable(startOfRange.GetContainer())) {
+        nsresult rv = SetInlinePropertyOnTextNode(
+            MOZ_KnownLive(*startOfRange.GetContainerAsText()),
+            startOfRange.Offset(), startOfRange.GetContainer()->Length(),
+            aProperty, aAttribute, aAttributeValue);
+        if (NS_WARN_IF(Destroyed())) {
+          return NS_ERROR_EDITOR_DESTROYED;
+        }
         if (NS_WARN_IF(NS_FAILED(rv))) {
           return rv;
         }
       }
 
-      // Then loop through the list, set the property on each node
-      for (auto& node : arrayOfNodes) {
-        rv = SetInlinePropertyOnNode(*node, aProperty, aAttribute, aValue);
+      // Then, apply new style to all nodes in the range entirely.
+      for (auto& content : arrayOfContents) {
+        nsresult rv = SetInlinePropertyOnNode(*content, aProperty, aAttribute,
+                                              aAttributeValue);
+        if (NS_WARN_IF(Destroyed())) {
+          return NS_ERROR_EDITOR_DESTROYED;
+        }
         if (NS_WARN_IF(NS_FAILED(rv))) {
           return rv;
         }
       }
 
-      // Last check the end parent of the range to see if it needs to be
-      // separately handled (it does if it's a text node, due to how the
-      // subtree iterator works - it will not have reported it).
-      if (endNode && endNode->GetAsText() && IsEditable(endNode)) {
-        rv = SetInlinePropertyOnTextNode(MOZ_KnownLive(*endNode->GetAsText()),
-                                         0, range->EndOffset(), aProperty,
-                                         aAttribute, aValue);
+      // Finally, if end node is a text node, apply new style to a part ot it.
+      if (endOfRange.IsInTextNode() && IsEditable(endOfRange.GetContainer())) {
+        nsresult rv = SetInlinePropertyOnTextNode(
+            MOZ_KnownLive(*endOfRange.GetContainerAsText()), 0,
+            endOfRange.Offset(), aProperty, aAttribute, aAttributeValue);
+        if (NS_WARN_IF(Destroyed())) {
+          return NS_ERROR_EDITOR_DESTROYED;
+        }
         if (NS_WARN_IF(NS_FAILED(rv))) {
           return rv;
         }
       }
     }
   }
-  if (cancel) {
-    return NS_OK;
-  }
-
-  rv = rules->DidDoAction(subActionInfo, rv);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  return NS_OK;
+  // Restoring `Selection` may have destroyed us.
+  return NS_WARN_IF(Destroyed()) ? NS_ERROR_EDITOR_DESTROYED : NS_OK;
 }
 
 // Helper function for SetInlinePropertyOn*: is aNode a simple old <b>, <font>,
@@ -1259,10 +1264,9 @@
       *this, EditSubAction::eRemoveAllTextProperties, nsIEditor::eNext);
 
   nsresult rv = RemoveInlinePropertyInternal(nullptr, nullptr);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return EditorBase::ToGenericNSResult(rv);
-  }
-  return NS_OK;
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
+                       "RemoveInlinePropertyInternal() failed");
+  return EditorBase::ToGenericNSResult(rv);
 }
 
 nsresult HTMLEditor::RemoveInlinePropertyAsAction(nsAtom& aProperty,
@@ -1288,10 +1292,9 @@
       break;
   }
   nsresult rv = RemoveInlinePropertyInternal(&aProperty, aAttribute);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return EditorBase::ToGenericNSResult(rv);
-  }
-  return NS_OK;
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
+                       "RemoveInlinePropertyInternal() failed");
+  return EditorBase::ToGenericNSResult(rv);
 }
 
 NS_IMETHODIMP
@@ -1319,10 +1322,9 @@
       break;
   }
   nsresult rv = RemoveInlinePropertyInternal(property, attribute);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return EditorBase::ToGenericNSResult(rv);
-  }
-  return NS_OK;
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
+                       "RemoveInlinePropertyInternal() failed");
+  return EditorBase::ToGenericNSResult(rv);
 }
 
 nsresult HTMLEditor::RemoveInlinePropertyInternal(nsAtom* aProperty,
@@ -1353,21 +1355,24 @@
     return NS_OK;
   }
 
+  // XXX Shouldn't we quit before calling `CommitComposition()`?
+  if (IsPlaintextEditor()) {
+    return NS_OK;
+  }
+
+  EditActionResult result = CanHandleHTMLEditSubAction();
+  if (NS_WARN_IF(result.Failed()) || result.Canceled()) {
+    return result.Rv();
+  }
+
   AutoPlaceholderBatch treatAsOneTransaction(*this);
   AutoEditSubActionNotifier startToHandleEditSubAction(
       *this, EditSubAction::eRemoveTextProperty, nsIEditor::eNext);
-  AutoSelectionRestorer restoreSelectionLater(*this);
-  AutoTransactionsConserveSelection dontChangeMySelection(*this);
 
-  bool cancel, handled;
-  EditSubActionInfo subActionInfo(EditSubAction::eRemoveTextProperty);
-  // Protect the edit rules object from dying
-  RefPtr<TextEditRules> rules(mRules);
-  nsresult rv = rules->WillDoAction(subActionInfo, &cancel, &handled);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  if (!cancel && !handled) {
+  {
+    AutoSelectionRestorer restoreSelectionLater(*this);
+    AutoTransactionsConserveSelection dontChangeMySelection(*this);
+
     // Loop through the ranges in the selection
     // Since ranges might be modified by SplitStyleAboveRange, we need hold
     // current ranges
@@ -1376,14 +1381,14 @@
       if (aProperty == nsGkAtoms::name) {
         // Promote range if it starts or end in a named anchor and we want to
         // remove named anchors
-        rv = PromoteRangeIfStartsOrEndsInNamedAnchor(*range);
+        nsresult rv = PromoteRangeIfStartsOrEndsInNamedAnchor(*range);
         if (NS_WARN_IF(NS_FAILED(rv))) {
           return rv;
         }
       } else {
         // Adjust range to include any ancestors whose children are entirely
         // selected
-        rv = PromoteInlineRange(*range);
+        nsresult rv = PromoteInlineRange(*range);
         if (NS_WARN_IF(NS_FAILED(rv))) {
           return rv;
         }
@@ -1391,90 +1396,109 @@
 
       // Remove this style from ancestors of our range endpoints, splitting
       // them as appropriate
-      rv = SplitStyleAboveRange(range, aProperty, aAttribute);
+      // FYI: `range` may be modified to a range starting from first right
+      //      node child at splitting at range start to first right node
+      //      child at splitting at range end.
+      nsresult rv = SplitStyleAboveRange(range, aProperty, aAttribute);
       if (NS_WARN_IF(NS_FAILED(rv))) {
         return rv;
       }
 
-      // Check for easy case: both range endpoints in same text node
-      nsCOMPtr<nsINode> startNode = range->GetStartContainer();
-      nsCOMPtr<nsINode> endNode = range->GetEndContainer();
-      if (startNode && startNode == endNode && startNode->GetAsText()) {
-        // We're done with this range!
-        if (IsCSSEnabled() && CSSEditUtils::IsCSSEditableProperty(
-                                  startNode, aProperty, aAttribute)) {
-          // The HTML style defined by aProperty/aAttribute has a CSS
-          // equivalence in this implementation for startNode
-          if (CSSEditUtils::IsCSSEquivalentToHTMLInlineStyleSet(
-                  startNode, aProperty, aAttribute, EmptyString(),
-                  CSSEditUtils::eComputed)) {
-            // startNode's computed style indicates the CSS equivalence to the
-            // HTML style to remove is applied; but we found no element in the
-            // ancestors of startNode carrying specified styles; assume it
-            // comes from a rule and try to insert a span "inverting" the style
-            if (CSSEditUtils::IsCSSInvertible(*aProperty, aAttribute)) {
-              NS_NAMED_LITERAL_STRING(value, "-moz-editor-invert-value");
-              SetInlinePropertyOnTextNode(
-                  MOZ_KnownLive(*startNode->GetAsText()), range->StartOffset(),
-                  range->EndOffset(), *aProperty, aAttribute, value);
-            }
-          }
-        }
-      } else {
-        // Not the easy case.  Range not contained in single text node.
+      EditorDOMPoint startOfRange(range->StartRef());
+      EditorDOMPoint endOfRange(range->EndRef());
+      if (NS_WARN_IF(!startOfRange.IsSet()) ||
+          NS_WARN_IF(!endOfRange.IsSet())) {
+        continue;
+      }
 
-        nsTArray<OwningNonNull<nsIContent>> arrayOfNodes;
+      if (startOfRange.GetContainer() == endOfRange.GetContainer() &&
+          startOfRange.IsInTextNode()) {
+        // TODO: If parent block has the removing style, we should create
+        //       `<span>` element to remove the style even in HTML mode
+        //       since Chrome does it.  See bug 1566795.
+        if (!IsCSSEnabled()) {
+          continue;
+        }
+        if (!CSSEditUtils::IsCSSEditableProperty(startOfRange.GetContainer(),
+                                                 aProperty, aAttribute)) {
+          continue;
+        }
+        // The HTML style defined by aProperty/aAttribute has a CSS
+        // equivalence in this implementation for startOfRange.
+        if (!CSSEditUtils::IsCSSEquivalentToHTMLInlineStyleSet(
+                startOfRange.GetContainer(), aProperty, aAttribute,
+                EmptyString(), CSSEditUtils::eComputed)) {
+          continue;
+        }
+        // startOfRange's computed style indicates the CSS equivalence to the
+        // HTML style to remove is applied; but we found no element in the
+        // ancestors of startOfRange carrying specified styles; assume it
+        // comes from a rule and try to insert a span "inverting" the style
+        if (!CSSEditUtils::IsCSSInvertible(*aProperty, aAttribute)) {
+          continue;
+        }
+        NS_NAMED_LITERAL_STRING(value, "-moz-editor-invert-value");
+        SetInlinePropertyOnTextNode(
+            MOZ_KnownLive(*startOfRange.GetContainerAsText()),
+            startOfRange.Offset(), endOfRange.Offset(), *aProperty, aAttribute,
+            value);
+        if (NS_WARN_IF(Destroyed())) {
+          return NS_ERROR_EDITOR_DESTROYED;
+        }
+        continue;
+      }
 
-        // Iterate range and build up array
-        ContentSubtreeIterator subtreeIter;
-        DebugOnly<nsresult> rvIgnored = subtreeIter.Init(range);
-        NS_WARNING_ASSERTION(NS_SUCCEEDED(rvIgnored),
-                             "Failed to initialize subtree iterator");
+      // Collect editable nodes which are entirely contained in the range.
+      AutoTArray<OwningNonNull<nsIContent>, 64> arrayOfContents;
+      ContentSubtreeIterator subtreeIter;
+      if (NS_SUCCEEDED(subtreeIter.Init(range))) {
         for (; !subtreeIter.IsDone(); subtreeIter.Next()) {
           nsCOMPtr<nsINode> node = subtreeIter.GetCurrentNode();
           if (NS_WARN_IF(!node)) {
             return NS_ERROR_FAILURE;
           }
-          if (IsEditable(node) && node->IsContent()) {
-            arrayOfNodes.AppendElement(*node->AsContent());
+          if (node->IsContent() && IsEditable(node)) {
+            arrayOfContents.AppendElement(*node->AsContent());
           }
         }
+      }
 
-        // Loop through the list, remove the property on each node
-        for (auto& node : arrayOfNodes) {
-          rv = RemoveStyleInside(node, aProperty, aAttribute);
-          if (NS_WARN_IF(NS_FAILED(rv))) {
-            return rv;
-          }
-          if (IsCSSEnabled() &&
-              CSSEditUtils::IsCSSEditableProperty(node, aProperty,
-                                                  aAttribute) &&
-              CSSEditUtils::IsCSSEquivalentToHTMLInlineStyleSet(
-                  node, aProperty, aAttribute, EmptyString(),
-                  CSSEditUtils::eComputed) &&
-              // startNode's computed style indicates the CSS equivalence to
-              // the HTML style to remove is applied; but we found no element
-              // in the ancestors of startNode carrying specified styles;
-              // assume it comes from a rule and let's try to insert a span
-              // "inverting" the style
-              CSSEditUtils::IsCSSInvertible(*aProperty, aAttribute)) {
-            NS_NAMED_LITERAL_STRING(value, "-moz-editor-invert-value");
-            SetInlinePropertyOnNode(node, *aProperty, aAttribute, value);
-          }
+      for (auto& content : arrayOfContents) {
+        nsresult rv = RemoveStyleInside(content, aProperty, aAttribute);
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return rv;
+        }
+        // TODO: If parent block has the removing style, we should create
+        //       `<span>` element to remove the style even in HTML mode
+        //       since Chrome does it.  See bug 1566795.
+        if (!IsCSSEnabled()) {
+          continue;
         }
+        if (!CSSEditUtils::IsCSSEditableProperty(content, aProperty,
+                                                 aAttribute)) {
+          continue;
+        }
+        if (!CSSEditUtils::IsCSSEquivalentToHTMLInlineStyleSet(
+                content, aProperty, aAttribute, EmptyString(),
+                CSSEditUtils::eComputed)) {
+          continue;
+        }
+        // startOfRange's computed style indicates the CSS equivalence to
+        // the HTML style to remove is applied; but we found no element
+        // in the ancestors of startOfRange carrying specified styles;
+        // assume it comes from a rule and let's try to insert a span
+        // "inverting" the style
+        if (!CSSEditUtils::IsCSSInvertible(*aProperty, aAttribute)) {
+          continue;
+        }
+        NS_NAMED_LITERAL_STRING(value, "-moz-editor-invert-value");
+        SetInlinePropertyOnNode(content, *aProperty, aAttribute, value);
       }
     }
   }
 
-  if (cancel) {
-    return NS_OK;
-  }
-
-  rv = rules->DidDoAction(subActionInfo, rv);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  return NS_OK;
+  // Restoring `Selection` may cause destroying us.
+  return NS_WARN_IF(Destroyed()) ? NS_ERROR_EDITOR_DESTROYED : NS_OK;
 }
 
 NS_IMETHODIMP
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/HTMLTableEditor.cpp firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/HTMLTableEditor.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/HTMLTableEditor.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/HTMLTableEditor.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -824,10 +824,8 @@
   }
 
   nsresult rv = DeleteSelectionAsSubAction(eNext, eStrip);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  return NS_OK;
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "DeleteSelectionAsSubAction() failed");
+  return rv;
 }
 
 NS_IMETHODIMP
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/TextEditor.cpp firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/TextEditor.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/TextEditor.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/TextEditor.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -634,13 +634,11 @@
   // delete placeholder txns merge.
   AutoPlaceholderBatch treatAsOneTransaction(*this, *nsGkAtoms::DeleteTxnName);
   nsresult rv = DeleteSelectionAsSubAction(aDirection, aStripWrappers);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return EditorBase::ToGenericNSResult(rv);
-  }
-  return NS_OK;
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "DeleteSelectionAsSubAction() failed");
+  return EditorBase::ToGenericNSResult(rv);
 }
 
-nsresult TextEditor::DeleteSelectionAsSubAction(EDirection aDirection,
+nsresult TextEditor::DeleteSelectionAsSubAction(EDirection aDirectionAndAmount,
                                                 EStripWrappers aStripWrappers) {
   MOZ_ASSERT(IsEditActionDataAvailable());
   MOZ_ASSERT(mPlaceholderBatch);
@@ -651,38 +649,14 @@
     return NS_ERROR_NOT_INITIALIZED;
   }
 
-  // Protect the edit rules object from dying
-  RefPtr<TextEditRules> rules(mRules);
-
   AutoEditSubActionNotifier startToHandleEditSubAction(
-      *this, EditSubAction::eDeleteSelectedContent, aDirection);
+      *this, EditSubAction::eDeleteSelectedContent, aDirectionAndAmount);
   EditSubActionInfo subActionInfo(EditSubAction::eDeleteSelectedContent);
-  subActionInfo.collapsedAction = aDirection;
-  subActionInfo.stripWrappers = aStripWrappers;
-  bool cancel, handled;
-  nsresult rv = rules->WillDoAction(subActionInfo, &cancel, &handled);
-  if (NS_WARN_IF(NS_FAILED(rv)) || cancel) {
-    return rv;
-  }
-  if (!handled) {
-    rv = DeleteSelectionWithTransaction(aDirection, aStripWrappers);
-  }
 
-  if (AsHTMLEditor()) {
-    EditorDOMPoint atNewStartOfSelection(
-        EditorBase::GetStartPoint(*SelectionRefPtr()));
-    if (NS_WARN_IF(!atNewStartOfSelection.IsSet())) {
-      return NS_ERROR_FAILURE;
-    }
-    if (atNewStartOfSelection.GetContainerAsContent()) {
-      nsresult rv =
-          MOZ_KnownLive(AsHTMLEditor())
-              ->DeleteMostAncestorMailCiteElementIfEmpty(MOZ_KnownLive(
-                  *atNewStartOfSelection.GetContainerAsContent()));
-      if (NS_WARN_IF(NS_FAILED(rv))) {
-        return rv;
-      }
-    }
+  EditActionResult result =
+      HandleDeleteSelection(aDirectionAndAmount, aStripWrappers);
+  if (NS_WARN_IF(result.Failed()) || result.Canceled()) {
+    return result.Rv();
   }
 
   // XXX This is odd.  We just tries to remove empty text node here but we
@@ -954,9 +928,6 @@
     return NS_ERROR_NOT_INITIALIZED;
   }
 
-  // Protect the edit rules object from dying.
-  RefPtr<TextEditRules> rules(mRules);
-
   EditSubAction editSubAction = ShouldHandleIMEComposition()
                                     ? EditSubAction::eInsertTextComingFromIME
                                     : EditSubAction::eInsertText;
@@ -964,32 +935,9 @@
   AutoEditSubActionNotifier startToHandleEditSubAction(*this, editSubAction,
                                                        nsIEditor::eNext);
 
-  nsAutoString resultString;
-  // XXX can we trust instring to outlive subActionInfo,
-  // XXX and subActionInfo not to refer to instring in its dtor?
-  // nsAutoString instring(aStringToInsert);
-  EditSubActionInfo subActionInfo(editSubAction);
-  subActionInfo.inString = &aStringToInsert;
-  subActionInfo.outString = &resultString;
-  subActionInfo.maxLength = mMaxTextLength;
-
-  bool cancel, handled;
-  nsresult rv = rules->WillDoAction(subActionInfo, &cancel, &handled);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  if (!cancel && !handled) {
-    // we rely on rules code for now - no default implementation
-  }
-  if (cancel) {
-    return NS_OK;
-  }
-  // post-process
-  rv = rules->DidDoAction(subActionInfo, NS_OK);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  return NS_OK;
+  EditActionResult result = HandleInsertText(editSubAction, aStringToInsert);
+  NS_WARNING_ASSERTION(result.Succeeded(), "HandleInsertText() failed");
+  return result.Rv();
 }
 
 NS_IMETHODIMP
@@ -1758,7 +1706,12 @@
     //     so that we need to keep using it here.
     AutoPlaceholderBatch treatAsOneTransaction(*this,
                                                *nsGkAtoms::DeleteTxnName);
-    DeleteSelectionAsSubAction(eNone, eStrip);
+    nsresult rv = DeleteSelectionAsSubAction(eNone, eStrip);
+    if (NS_WARN_IF(rv == NS_ERROR_EDITOR_DESTROYED)) {
+      return EditorBase::ToGenericNSResult(NS_ERROR_EDITOR_DESTROYED);
+    }
+    NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
+                         "DeleteSelectionAsSubAction() failed, but ignored");
   }
   return EditorBase::ToGenericNSResult(
       actionTaken ? NS_OK : NS_ERROR_EDITOR_ACTION_CANCELED);
@@ -1898,12 +1851,10 @@
 
   nsresult rv =
       ComputeValueInternal(aFormatType, aDocumentEncoderFlags, aOutputString);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    // This is low level API for XUL applcation.  So, we should return raw
-    // error code here.
-    return rv;
-  }
-  return NS_OK;
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "ComputeValueInternal() failed");
+  // This is low level API for XUL application.  So, we should return raw
+  // error code here.
+  return rv;
 }
 
 nsresult TextEditor::ComputeValueInternal(const nsAString& aFormatType,
@@ -1911,27 +1862,26 @@
                                           nsAString& aOutputString) const {
   MOZ_ASSERT(IsEditActionDataAvailable());
 
-  // Protect the edit rules object from dying
-  RefPtr<TextEditRules> rules(mRules);
-
-  EditSubActionInfo subActionInfo(EditSubAction::eComputeTextToOutput);
-  subActionInfo.outString = &aOutputString;
-  subActionInfo.flags = aDocumentEncoderFlags;
-  subActionInfo.outputFormat = &aFormatType;
-
-  bool cancel{false};
-  bool handled{false};
-  nsresult rv = rules->WillDoAction(subActionInfo, &cancel, &handled);
-  if (NS_FAILED(rv) || cancel) {
-    return rv;
-  }
-  if (handled) {
-    // This case will get triggered by password fields or single text node only.
-    return rv;
+  // First, let's try to get the value simply only from text node if the
+  // caller wants plaintext value.
+  if (aFormatType.LowerCaseEqualsLiteral("text/plain")) {
+    // If it's necessary to check selection range or the editor wraps hard,
+    // we need some complicated handling.  In such case, we need to use the
+    // expensive path.
+    // XXX Anything else what we cannot return the text node data simply?
+    if (!(aDocumentEncoderFlags & (nsIDocumentEncoder::OutputSelectionOnly |
+                                   nsIDocumentEncoder::OutputWrap))) {
+      EditActionResult result =
+          ComputeValueFromTextNodeAndPaddingBRElement(aOutputString);
+      if (NS_WARN_IF(result.Failed()) || result.Canceled() ||
+          result.Handled()) {
+        return result.Rv();
+      }
+    }
   }
 
   nsAutoCString charset;
-  rv = GetDocumentCharsetInternal(charset);
+  nsresult rv = GetDocumentCharsetInternal(charset);
   if (NS_FAILED(rv) || charset.IsEmpty()) {
     charset.AssignLiteral("windows-1252");
   }
@@ -1942,12 +1892,10 @@
     return NS_ERROR_FAILURE;
   }
 
-  // XXX Why don't we call TextEditRules::DidDoAction() here?
   rv = encoder->EncodeToString(aOutputString);
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  return NS_OK;
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
+                       "nsIDocumentEncoder::EncodeToString() failed");
+  return rv;
 }
 
 nsresult TextEditor::PasteAsQuotationAsAction(int32_t aClipboardType,
@@ -2057,7 +2005,7 @@
 }
 
 nsresult TextEditor::SharedOutputString(uint32_t aFlags, bool* aIsCollapsed,
-                                        nsAString& aResult) {
+                                        nsAString& aResult) const {
   MOZ_ASSERT(IsEditActionDataAvailable());
 
   *aIsCollapsed = SelectionRefPtr()->IsCollapsed();
@@ -2066,7 +2014,10 @@
     aFlags |= nsIDocumentEncoder::OutputSelectionOnly;
   }
   // If the selection isn't collapsed, we'll use the whole document.
-  return ComputeValueInternal(NS_LITERAL_STRING("text/plain"), aFlags, aResult);
+  nsresult rv =
+      ComputeValueInternal(NS_LITERAL_STRING("text/plain"), aFlags, aResult);
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "ComputeValueInternal() failed");
+  return rv;
 }
 
 void TextEditor::OnStartToHandleTopLevelEditSubAction(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/TextEditorDataTransfer.cpp firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/TextEditorDataTransfer.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/TextEditorDataTransfer.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/TextEditorDataTransfer.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -73,9 +73,6 @@
   if (aDoDeleteSelection) {
     AutoTrackDOMPoint tracker(RangeUpdaterRef(), &pointToInsert);
     nsresult rv = DeleteSelectionAsSubAction(eNone, eStrip);
-    if (NS_WARN_IF(Destroyed())) {
-      return NS_ERROR_EDITOR_DESTROYED;
-    }
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return rv;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/TextEditor.h firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/TextEditor.h
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/TextEditor.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/TextEditor.h	2019-09-15 11:33:10.000000000 +0000
@@ -214,8 +214,8 @@
    *                            JS.  If set to nullptr, will be treated as
    *                            called by system.
    */
-  nsresult InsertTextAsAction(const nsAString& aStringToInsert,
-                              nsIPrincipal* aPrincipal = nullptr);
+  MOZ_CAN_RUN_SCRIPT nsresult InsertTextAsAction(
+      const nsAString& aStringToInsert, nsIPrincipal* aPrincipal = nullptr);
 
   /**
    * PasteAsQuotationAsAction() pastes content in clipboard as quotation.
@@ -423,7 +423,8 @@
    *
    * @param aStringToInsert     The string to insert.
    */
-  nsresult InsertTextAsSubAction(const nsAString& aStringToInsert);
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult
+  InsertTextAsSubAction(const nsAString& aStringToInsert);
 
   /**
    * DeleteSelectionAsSubAction() removes selection content or content around
@@ -586,7 +587,7 @@
    *                            more characters, returns "as handled".
    */
   EditActionResult TruncateInsertionStringForMaxLength(
-      nsAString& aInsertionString, uint32_t aMaxLength);
+      nsAString& aInsertionString);
 
   /**
    * InsertLineFeedCharacterAtSelection() inserts a linefeed character at
@@ -595,6 +596,70 @@
   MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE EditActionResult
   InsertLineFeedCharacterAtSelection();
 
+  /**
+   * Handles the newline characters according to the default system prefs
+   * (editor.singleLine.pasteNewlines).
+   * Each value means:
+   *   nsIPlaintextEditor::eNewlinesReplaceWithSpaces (2, Firefox default):
+   *     replace newlines with spaces.
+   *   nsIPlaintextEditor::eNewlinesStrip (3):
+   *     remove newlines from the string.
+   *   nsIPlaintextEditor::eNewlinesReplaceWithCommas (4, Thunderbird default):
+   *     replace newlines with commas.
+   *   nsIPlaintextEditor::eNewlinesStripSurroundingWhitespace (5):
+   *     collapse newlines and surrounding whitespace characters and
+   *     remove them from the string.
+   *   nsIPlaintextEditor::eNewlinesPasteIntact (0):
+   *     only remove the leading and trailing newlines.
+   *   nsIPlaintextEditor::eNewlinesPasteToFirst (1) or any other value:
+   *     remove the first newline and all characters following it.
+   *
+   * @param aString the string to be modified in place.
+   */
+  void HandleNewLinesInStringForSingleLineEditor(nsString& aString) const;
+
+  /**
+   * HandleInsertText() handles inserting text at selection.
+   *
+   * @param aEditSubAction      Must be EditSubAction::eInsertText or
+   *                            EditSubAction::eInsertTextComingFromIME.
+   * @param aInsertionString    String to be inserted at selection.
+   */
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE virtual EditActionResult HandleInsertText(
+      EditSubAction aEditSubAction, const nsAString& aInsertionString);
+
+  /**
+   * HandleDeleteSelectionInternal() is a helper method of
+   * HandleDeleteSelection().  Must be called only when the instance is
+   * TextEditor.
+   * NOTE: This method creates SelectionBatcher.  Therefore, each caller
+   *       needs to check if the editor is still available even if this returns
+   *       NS_OK.
+   */
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE EditActionResult
+  HandleDeleteSelectionInternal(nsIEditor::EDirection aDirectionAndAmount,
+                                nsIEditor::EStripWrappers aStripWrappers);
+
+  /**
+   * This method handles "delete selection" commands.
+   *
+   * @param aDirectionAndAmount Direction of the deletion.
+   * @param aStripWrappers      Always ignored in TextEditor.
+   */
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE virtual EditActionResult
+  HandleDeleteSelection(nsIEditor::EDirection aDirectionAndAmount,
+                        nsIEditor::EStripWrappers aStripWrappers);
+
+  /**
+   * ComputeValueFromTextNodeAndPaddingBRElement() tries to compute "value" of
+   * this editor content only with text node and padding `<br>` element.
+   * If this succeeds to compute the value, it's returned with aValue and
+   * the result is marked as "handled".  Otherwise, the caller needs to
+   * compute it with another way.
+   */
+  EditActionResult ComputeValueFromTextNodeAndPaddingBRElement(
+      nsAString& aValue) const;
+
  protected:  // Called by helper classes.
   virtual void OnStartToHandleTopLevelEditSubAction(
       EditSubAction aEditSubAction, nsIEditor::EDirection aDirection) override;
@@ -633,6 +698,13 @@
   int32_t WrapWidth() const { return mWrapColumn; }
 
   /**
+   * CanEchoPasswordNow() returns true if currently we can echo password.
+   * If it's direct user input such as pasting or dropping text, this
+   * returns false even if we may echo password.
+   */
+  bool CanEchoPasswordNow() const;
+
+  /**
    * Make the given selection span the entire document.
    */
   MOZ_CAN_RUN_SCRIPT
@@ -643,7 +715,8 @@
    *
    * @param aStringToInsert     The string to insert.
    */
-  nsresult OnInputText(const nsAString& aStringToInsert);
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult
+  OnInputText(const nsAString& aStringToInsert);
 
   /**
    * InsertLineBreakAsSubAction() inserts a line break, i.e., \n if it's
@@ -687,7 +760,8 @@
    * @param aQuotedText         String to insert.  This will be quoted by ">"
    *                            automatically.
    */
-  nsresult InsertWithQuotationsAsSubAction(const nsAString& aQuotedText);
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult
+  InsertWithQuotationsAsSubAction(const nsAString& aQuotedText);
 
   /**
    * Return true if the data is safe to insert as the source and destination
@@ -730,7 +804,8 @@
    */
   virtual nsresult PrepareTransferable(nsITransferable** transferable);
 
-  nsresult InsertTextFromTransferable(nsITransferable* transferable);
+  MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult
+  InsertTextFromTransferable(nsITransferable* transferable);
 
   /**
    * DeleteSelectionAndCreateElement() creates a element whose name is aTag.
@@ -756,7 +831,7 @@
    * string.
    */
   nsresult SharedOutputString(uint32_t aFlags, bool* aIsCollapsed,
-                              nsAString& aResult);
+                              nsAString& aResult) const;
 
   /**
    * See comment of IsCopyToClipboardAllowed() for the detail.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/TextEditRules.cpp firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/TextEditRules.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/TextEditRules.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/TextEditRules.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -202,23 +202,9 @@
 
   // my kingdom for dynamic cast
   switch (aInfo.mEditSubAction) {
-    case EditSubAction::eInsertText:
-    case EditSubAction::eInsertTextComingFromIME:
-      TextEditorRef().UndefineCaretBidiLevel();
-      return WillInsertText(aInfo.mEditSubAction, aCancel, aHandled,
-                            aInfo.inString, aInfo.outString, aInfo.maxLength);
     case EditSubAction::eSetText:
       TextEditorRef().UndefineCaretBidiLevel();
       return WillSetText(aCancel, aHandled, aInfo.inString, aInfo.maxLength);
-    case EditSubAction::eDeleteSelectedContent:
-      return WillDeleteSelection(aInfo.collapsedAction, aCancel, aHandled);
-    case EditSubAction::eSetTextProperty:
-      return WillSetTextProperty(aCancel, aHandled);
-    case EditSubAction::eRemoveTextProperty:
-      return WillRemoveTextProperty(aCancel, aHandled);
-    case EditSubAction::eComputeTextToOutput:
-      return WillOutputText(aInfo.outputFormat, aInfo.outString, aInfo.flags,
-                            aCancel, aHandled);
     case EditSubAction::eInsertQuotedText: {
       CANCEL_OPERATION_IF_READONLY_OR_DISABLED
 
@@ -232,8 +218,12 @@
                            "Failed to remove padding <br> element");
       return rv;
     }
+    case EditSubAction::eComputeTextToOutput:
+    case EditSubAction::eDeleteSelectedContent:
     case EditSubAction::eInsertElement:
     case EditSubAction::eInsertLineBreak:
+    case EditSubAction::eInsertText:
+    case EditSubAction::eInsertTextComingFromIME:
     case EditSubAction::eUndo:
     case EditSubAction::eRedo:
       MOZ_ASSERT_UNREACHABLE("This path should've been dead code");
@@ -250,9 +240,12 @@
   }
 
   switch (aInfo.mEditSubAction) {
+    case EditSubAction::eComputeTextToOutput:
     case EditSubAction::eDeleteSelectedContent:
     case EditSubAction::eInsertElement:
     case EditSubAction::eInsertLineBreak:
+    case EditSubAction::eInsertText:
+    case EditSubAction::eInsertTextComingFromIME:
     case EditSubAction::eUndo:
     case EditSubAction::eRedo:
       MOZ_ASSERT_UNREACHABLE("This path should've been dead code");
@@ -284,7 +277,7 @@
   if (mMaxTextLength >= 0) {
     nsAutoString insertionString(NS_LITERAL_STRING("\n"));
     EditActionResult result =
-        TruncateInsertionStringForMaxLength(insertionString, mMaxTextLength);
+        TruncateInsertionStringForMaxLength(insertionString);
     if (NS_WARN_IF(result.Failed())) {
       return result;
     }
@@ -298,9 +291,6 @@
   if (!SelectionRefPtr()->IsCollapsed()) {
     nsresult rv =
         DeleteSelectionAsSubAction(nsIEditor::eNone, nsIEditor::eStrip);
-    if (NS_WARN_IF(Destroyed())) {
-      return EditActionIgnored(NS_ERROR_EDITOR_DESTROYED);
-    }
     if (NS_WARN_IF(NS_FAILED(rv))) {
       return EditActionIgnored(rv);
     }
@@ -439,37 +429,11 @@
   return NS_OK;
 }
 
-already_AddRefed<nsINode>
-TextEditRules::GetTextNodeAroundSelectionStartContainer() {
-  MOZ_ASSERT(IsEditorDataAvailable());
-
-  EditorRawDOMPoint selectionStartPoint(
-      EditorBase::GetStartPoint(*SelectionRefPtr()));
-  if (NS_WARN_IF(!selectionStartPoint.IsSet())) {
-    return nullptr;
-  }
-  if (selectionStartPoint.IsInTextNode()) {
-    nsCOMPtr<nsINode> node = selectionStartPoint.GetContainer();
-    return node.forget();
-  }
-  // This should be the root node, walk the tree looking for text nodes.
-  // XXX NodeIterator sets mutation observer even for this temporary use.
-  //     It's too expensive if this is called from a hot path.
-  nsCOMPtr<nsINode> node = selectionStartPoint.GetContainer();
-  RefPtr<NodeIterator> iter =
-      new NodeIterator(node, NodeFilter_Binding::SHOW_TEXT, nullptr);
-  while (!EditorBase::IsTextNode(node)) {
-    node = iter->NextNode(IgnoreErrors());
-    if (!node) {
-      return nullptr;
-    }
-  }
-  return node.forget();
-}
-
-void TextEditRules::HandleNewLines(nsString& aString) {
+void TextEditor::HandleNewLinesInStringForSingleLineEditor(
+    nsString& aString) const {
   static const char16_t kLF = static_cast<char16_t>('\n');
-  MOZ_ASSERT(IsEditorDataAvailable());
+  MOZ_ASSERT(IsEditActionDataAvailable());
+  MOZ_ASSERT(IsPlaintextEditor());
   MOZ_ASSERT(aString.FindChar(static_cast<uint16_t>('\r')) == kNotFound);
 
   // First of all, check if aString contains '\n' since if the string
@@ -479,7 +443,7 @@
     return;
   }
 
-  switch (TextEditorRef().mNewlineHandling) {
+  switch (mNewlineHandling) {
     case nsIPlaintextEditor::eNewlinesReplaceWithSpaces:
       // Default of Firefox:
       // Strip trailing newlines first so we don't wind up with trailing spaces
@@ -540,84 +504,67 @@
   }
 }
 
-nsresult TextEditRules::WillInsertText(EditSubAction aEditSubAction,
-                                       bool* aCancel, bool* aHandled,
-                                       const nsAString* inString,
-                                       nsAString* outString,
-                                       int32_t aMaxLength) {
-  MOZ_ASSERT(IsEditorDataAvailable());
+EditActionResult TextEditor::HandleInsertText(
+    EditSubAction aEditSubAction, const nsAString& aInsertionString) {
+  MOZ_ASSERT(IsEditActionDataAvailable());
+  MOZ_ASSERT(aEditSubAction == EditSubAction::eInsertText ||
+             aEditSubAction == EditSubAction::eInsertTextComingFromIME);
 
-  if (NS_WARN_IF(!aCancel) || NS_WARN_IF(!aHandled)) {
-    return NS_ERROR_INVALID_ARG;
-  }
+  UndefineCaretBidiLevel();
 
-  if (inString->IsEmpty() &&
+  if (aInsertionString.IsEmpty() &&
       aEditSubAction != EditSubAction::eInsertTextComingFromIME) {
     // HACK: this is a fix for bug 19395
     // I can't outlaw all empty insertions
     // because IME transaction depend on them
     // There is more work to do to make the
     // world safe for IME.
-    *aCancel = true;
-    *aHandled = false;
-    return NS_OK;
+    return EditActionCanceled();
   }
 
-  // initialize out param
-  *aCancel = false;
-  *aHandled = true;
-
-  outString->Assign(*inString);
-  if (aMaxLength >= 0) {
+  nsAutoString insertionString(aInsertionString);
+  if (mMaxTextLength >= 0) {
     EditActionResult result =
-        TextEditorRef().TruncateInsertionStringForMaxLength(*outString,
-                                                            aMaxLength);
+        TruncateInsertionStringForMaxLength(insertionString);
     if (NS_WARN_IF(result.Failed())) {
-      return result.Rv();
+      return result.MarkAsHandled();
     }
     // If we're exceeding the maxlength when composing IME, we need to clean up
     // the composing text, so we shouldn't return early.
-    if (result.Handled() && outString->IsEmpty() &&
+    if (result.Handled() && insertionString.IsEmpty() &&
         aEditSubAction != EditSubAction::eInsertTextComingFromIME) {
-      *aCancel = true;
-      return NS_OK;
+      return EditActionCanceled();
     }
   }
 
   uint32_t start = 0;
   if (IsPasswordEditor()) {
-    if (TextEditorRef().GetComposition() &&
-        !TextEditorRef().GetComposition()->String().IsEmpty()) {
-      start = TextEditorRef().GetComposition()->XPOffsetInTextNode();
+    if (GetComposition() && !GetComposition()->String().IsEmpty()) {
+      start = GetComposition()->XPOffsetInTextNode();
     } else {
       uint32_t end = 0;
-      nsContentUtils::GetSelectionInTextControl(
-          SelectionRefPtr(), TextEditorRef().GetRoot(), start, end);
+      nsContentUtils::GetSelectionInTextControl(SelectionRefPtr(), GetRoot(),
+                                                start, end);
     }
   }
 
   // if the selection isn't collapsed, delete it.
   if (!SelectionRefPtr()->IsCollapsed()) {
     nsresult rv =
-        MOZ_KnownLive(TextEditorRef())
-            .DeleteSelectionAsSubAction(nsIEditor::eNone, nsIEditor::eStrip);
-    if (NS_WARN_IF(!CanHandleEditAction())) {
-      return NS_ERROR_EDITOR_DESTROYED;
-    }
+        DeleteSelectionAsSubAction(nsIEditor::eNone, nsIEditor::eStrip);
     if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+      return EditActionHandled(rv);
     }
   }
 
-  // XXX Why do we set `aCancel` here, but ignore it?
-  CANCEL_OPERATION_IF_READONLY_OR_DISABLED
+  // XXX Why don't we cancel here?  Shouldn't we do this first?
+  CANCEL_OPERATION_AND_RETURN_EDIT_ACTION_RESULT_IF_READONLY_OF_DISABLED
 
-  TextEditorRef().MaybeDoAutoPasswordMasking();
+  MaybeDoAutoPasswordMasking();
 
-  nsresult rv =
-      MOZ_KnownLive(TextEditorRef()).EnsureNoPaddingBRElementForEmptyEditor();
+  nsresult rv = EnsureNoPaddingBRElementForEmptyEditor();
   if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    return EditActionHandled(rv);
   }
 
   // People have lots of different ideas about what text fields
@@ -631,7 +578,6 @@
   // 5. strip newlines and surrounding whitespace
   // So find out what we're expected to do:
   if (IsSingleLineEditor()) {
-    nsAutoString tString(*outString);
     // XXX Some callers of TextEditor::InsertTextAsAction()  already make the
     //     string use only \n as a linebreaker.  However, they are not hot
     //     path and nsContentUtils::PlatformToDOMLineBreaks() does nothing
@@ -639,104 +585,98 @@
     //     here.  Note that there are too many callers of
     //     TextEditor::InsertTextAsAction().  So, it's difficult to keep
     //     maintaining all of them won't reach here without \r nor \r\n.
-    nsContentUtils::PlatformToDOMLineBreaks(tString);
-    HandleNewLines(tString);
-    outString->Assign(tString);
+    // XXX Should we handle do this before truncating the string for
+    //     `maxlength`?
+    nsContentUtils::PlatformToDOMLineBreaks(insertionString);
+    HandleNewLinesInStringForSingleLineEditor(insertionString);
   }
 
   // get the (collapsed) selection location
   nsRange* firstRange = SelectionRefPtr()->GetRangeAt(0);
   if (NS_WARN_IF(!firstRange)) {
-    return NS_ERROR_FAILURE;
+    return EditActionHandled(NS_ERROR_FAILURE);
   }
   EditorRawDOMPoint atStartOfSelection(firstRange->StartRef());
   if (NS_WARN_IF(!atStartOfSelection.IsSetAndValid())) {
-    return NS_ERROR_FAILURE;
+    return EditActionHandled(NS_ERROR_FAILURE);
   }
 
   // don't put text in places that can't have it
   if (!atStartOfSelection.IsInTextNode() &&
-      !TextEditorRef().CanContainTag(*atStartOfSelection.GetContainer(),
-                                     *nsGkAtoms::textTagName)) {
-    return NS_ERROR_FAILURE;
+      !CanContainTag(*atStartOfSelection.GetContainer(),
+                     *nsGkAtoms::textTagName)) {
+    return EditActionHandled(NS_ERROR_FAILURE);
   }
 
-  // we need to get the doc
-  RefPtr<Document> doc = TextEditorRef().GetDocument();
-  if (NS_WARN_IF(!doc)) {
-    return NS_ERROR_NOT_INITIALIZED;
+  RefPtr<Document> document = GetDocument();
+  if (NS_WARN_IF(!document)) {
+    return EditActionHandled(NS_ERROR_NOT_INITIALIZED);
   }
 
   if (aEditSubAction == EditSubAction::eInsertTextComingFromIME) {
-    EditorRawDOMPoint compositionStartPoint =
-        TextEditorRef().GetCompositionStartPoint();
+    EditorRawDOMPoint compositionStartPoint = GetCompositionStartPoint();
     if (!compositionStartPoint.IsSet()) {
-      compositionStartPoint =
-          TextEditorRef().FindBetterInsertionPoint(atStartOfSelection);
+      compositionStartPoint = FindBetterInsertionPoint(atStartOfSelection);
     }
-    nsresult rv =
-        MOZ_KnownLive(TextEditorRef())
-            .InsertTextWithTransaction(*doc, *outString, compositionStartPoint);
-    if (NS_WARN_IF(!CanHandleEditAction())) {
-      return NS_ERROR_EDITOR_DESTROYED;
+    nsresult rv = InsertTextWithTransaction(*document, insertionString,
+                                            compositionStartPoint);
+    if (NS_WARN_IF(Destroyed())) {
+      return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
     }
     if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+      return EditActionHandled(rv);
     }
   } else {
-    // aEditSubAction == EditSubAction::eInsertText
+    MOZ_ASSERT(aEditSubAction == EditSubAction::eInsertText);
 
     // don't change my selection in subtransactions
-    AutoTransactionsConserveSelection dontChangeMySelection(TextEditorRef());
+    AutoTransactionsConserveSelection dontChangeMySelection(*this);
 
     EditorRawDOMPoint pointAfterStringInserted;
-    nsresult rv =
-        MOZ_KnownLive(TextEditorRef())
-            .InsertTextWithTransaction(*doc, *outString, atStartOfSelection,
-                                       &pointAfterStringInserted);
-    if (NS_WARN_IF(!CanHandleEditAction())) {
-      return NS_ERROR_EDITOR_DESTROYED;
+    nsresult rv = InsertTextWithTransaction(*document, insertionString,
+                                            atStartOfSelection,
+                                            &pointAfterStringInserted);
+    if (NS_WARN_IF(Destroyed())) {
+      return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
     }
     if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
+      return EditActionHandled(rv);
     }
 
     if (pointAfterStringInserted.IsSet()) {
       // Make the caret attach to the inserted text, unless this text ends with
       // a LF, in which case make the caret attach to the next line.
-      bool endsWithLF = !outString->IsEmpty() && outString->Last() == nsCRT::LF;
-      IgnoredErrorResult error;
-      SelectionRefPtr()->SetInterlinePosition(endsWithLF, error);
-      NS_WARNING_ASSERTION(!error.Failed(),
-                           "Failed to set or unset interline position");
+      bool endsWithLF =
+          !insertionString.IsEmpty() && insertionString.Last() == nsCRT::LF;
+      IgnoredErrorResult ignoredError;
+      SelectionRefPtr()->SetInterlinePosition(endsWithLF, ignoredError);
+      NS_WARNING_ASSERTION(
+          !ignoredError.Failed(),
+          "Selection::SetInterlinePosition() failed, but ignored");
 
       MOZ_ASSERT(
           !pointAfterStringInserted.GetChild(),
           "After inserting text into a text node, pointAfterStringInserted."
           "GetChild() should be nullptr");
-      error = IgnoredErrorResult();
-      SelectionRefPtr()->Collapse(pointAfterStringInserted, error);
-      if (NS_WARN_IF(!CanHandleEditAction())) {
-        return NS_ERROR_EDITOR_DESTROYED;
+      ignoredError = IgnoredErrorResult();
+      SelectionRefPtr()->Collapse(pointAfterStringInserted, ignoredError);
+      if (NS_WARN_IF(Destroyed())) {
+        return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
       }
-      NS_WARNING_ASSERTION(
-          !error.Failed(),
-          "Failed to collapse selection after inserting string");
+      NS_WARNING_ASSERTION(!ignoredError.Failed(),
+                           "Selection::Collapse() failed, but ignored");
     }
   }
 
   // Unmask inputted character(s) if necessary.
-  if (IsPasswordEditor() && IsMaskingPassword() && !DontEchoPassword()) {
-    nsresult rv =
-        MOZ_KnownLive(TextEditorRef())
-            .SetUnmaskRangeAndNotify(start, outString->Length(),
-                                     LookAndFeel::GetPasswordMaskDelay());
-    if (NS_WARN_IF(NS_FAILED(rv))) {
-      return rv;
-    }
+  if (IsPasswordEditor() && IsMaskingPassword() && CanEchoPasswordNow()) {
+    nsresult rv = SetUnmaskRangeAndNotify(start, insertionString.Length(),
+                                          LookAndFeel::GetPasswordMaskDelay());
+    NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "SetUnmaskRangeAndNotify() failed");
+    return EditActionHandled(rv);
   }
 
-  return NS_OK;
+  return EditActionHandled();
 }
 
 nsresult TextEditRules::WillSetText(bool* aCancel, bool* aHandled,
@@ -812,7 +752,7 @@
   //     Is this intentional?
   nsAutoString tString(*aString);
   if (IsSingleLineEditor() && !IsPasswordEditor()) {
-    HandleNewLines(tString);
+    TextEditorRef().HandleNewLinesInStringForSingleLineEditor(tString);
   }
 
   if (!firstChild || !EditorBase::IsTextNode(firstChild)) {
@@ -878,70 +818,37 @@
   return NS_OK;
 }
 
-nsresult TextEditRules::WillSetTextProperty(bool* aCancel, bool* aHandled) {
-  if (NS_WARN_IF(!aCancel) || NS_WARN_IF(!aHandled)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  // XXX: should probably return a success value other than NS_OK that means
-  // "not allowed"
-  if (IsPlaintextEditor()) {
-    *aCancel = true;
-  }
-  return NS_OK;
-}
-
-nsresult TextEditRules::WillRemoveTextProperty(bool* aCancel, bool* aHandled) {
-  if (NS_WARN_IF(!aCancel) || NS_WARN_IF(!aHandled)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-
-  // XXX: should probably return a success value other than NS_OK that means
-  // "not allowed"
-  if (IsPlaintextEditor()) {
-    *aCancel = true;
-  }
-  return NS_OK;
-}
-
-nsresult TextEditRules::WillDeleteSelection(
-    nsIEditor::EDirection aCollapsedAction, bool* aCancel, bool* aHandled) {
-  MOZ_ASSERT(IsEditorDataAvailable());
+EditActionResult TextEditor::HandleDeleteSelection(
+    nsIEditor::EDirection aDirectionAndAmount,
+    nsIEditor::EStripWrappers aStripWrappers) {
+  MOZ_ASSERT(IsEditActionDataAvailable());
 
-  if (NS_WARN_IF(!aCancel) || NS_WARN_IF(!aHandled)) {
-    return NS_ERROR_INVALID_ARG;
-  }
-  CANCEL_OPERATION_IF_READONLY_OR_DISABLED
+  UndefineCaretBidiLevel();
 
-  // initialize out param
-  *aCancel = false;
-  *aHandled = false;
+  CANCEL_OPERATION_AND_RETURN_EDIT_ACTION_RESULT_IF_READONLY_OF_DISABLED
 
   // if there is only padding <br> element for empty editor, cancel the
   // operation.
-  if (TextEditorRef().HasPaddingBRElementForEmptyEditor()) {
-    *aCancel = true;
-    return NS_OK;
+  if (HasPaddingBRElementForEmptyEditor()) {
+    return EditActionCanceled();
   }
-  nsresult rv =
-      DeleteSelectionWithTransaction(aCollapsedAction, aCancel, aHandled);
-  // DeleteSelectionWithTransaction() creates SelectionBatcher.  Therefore,
+  EditActionResult result =
+      HandleDeleteSelectionInternal(aDirectionAndAmount, aStripWrappers);
+  // HandleDeleteSelectionInternal() creates SelectionBatcher.  Therefore,
   // quitting from it might cause having destroyed the editor.
-  if (NS_WARN_IF(!CanHandleEditAction())) {
-    return NS_ERROR_EDITOR_DESTROYED;
+  if (NS_WARN_IF(Destroyed())) {
+    return result.SetResult(NS_ERROR_EDITOR_DESTROYED);
   }
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-  return NS_OK;
+  NS_WARNING_ASSERTION(result.Succeeded(),
+                       "HandleDeleteSelectionInternal() failed");
+  return result;
 }
 
-nsresult TextEditRules::DeleteSelectionWithTransaction(
-    nsIEditor::EDirection aCollapsedAction, bool* aCancel, bool* aHandled) {
-  MOZ_ASSERT(IsEditorDataAvailable());
-  MOZ_ASSERT(aCancel);
-  MOZ_ASSERT(*aCancel == false);
-  MOZ_ASSERT(aHandled);
+EditActionResult TextEditor::HandleDeleteSelectionInternal(
+    nsIEditor::EDirection aDirectionAndAmount,
+    nsIEditor::EStripWrappers aStripWrappers) {
+  MOZ_ASSERT(IsEditActionDataAvailable());
+  MOZ_ASSERT(!AsHTMLEditor());
 
   // If the current selection is empty (e.g the user presses backspace with
   // a collapsed selection), then we want to avoid sending the selectstart
@@ -954,103 +861,73 @@
   nsAutoScriptBlocker scriptBlocker;
 
   if (IsPasswordEditor() && IsMaskingPassword()) {
-    TextEditorRef().MaskAllCharacters();
+    MaskAllCharacters();
   } else {
     EditorRawDOMPoint selectionStartPoint(
         EditorBase::GetStartPoint(*SelectionRefPtr()));
     if (NS_WARN_IF(!selectionStartPoint.IsSet())) {
-      return NS_ERROR_FAILURE;
+      return EditActionResult(NS_ERROR_FAILURE);
     }
 
     if (!SelectionRefPtr()->IsCollapsed()) {
-      return NS_OK;
+      nsresult rv =
+          DeleteSelectionWithTransaction(aDirectionAndAmount, aStripWrappers);
+      NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
+                           "DeleteSelectionWithTransaction() failed");
+      return EditActionHandled(rv);
     }
 
     // Test for distance between caret and text that will be deleted
-    EditActionResult result = TextEditorRef().SetCaretBidiLevelForDeletion(
-        selectionStartPoint, aCollapsedAction);
-    if (NS_WARN_IF(result.Failed())) {
-      return result.Rv();
-    }
-    if (result.Canceled()) {
-      *aCancel = true;
-      return NS_OK;
+    EditActionResult result =
+        SetCaretBidiLevelForDeletion(selectionStartPoint, aDirectionAndAmount);
+    if (NS_WARN_IF(result.Failed()) || result.Canceled()) {
+      return result;
     }
   }
 
-  nsresult rv = TextEditorRef().ExtendSelectionForDelete(&aCollapsedAction);
+  nsresult rv = ExtendSelectionForDelete(&aDirectionAndAmount);
   if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
+    return EditActionResult(rv);
   }
 
-  rv = MOZ_KnownLive(TextEditorRef())
-           .DeleteSelectionWithTransaction(aCollapsedAction, nsIEditor::eStrip);
-  if (NS_WARN_IF(!CanHandleEditAction())) {
-    return NS_ERROR_EDITOR_DESTROYED;
+  rv = DeleteSelectionWithTransaction(aDirectionAndAmount, aStripWrappers);
+  if (NS_WARN_IF(Destroyed())) {
+    return EditActionResult(NS_ERROR_EDITOR_DESTROYED);
   }
-  if (NS_WARN_IF(NS_FAILED(rv))) {
-    return rv;
-  }
-
-  *aHandled = true;
-  return NS_OK;
+  NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
+                       "DeleteSelectionWithTransaction() failed");
+  return EditActionHandled(rv);
 }
 
-nsresult TextEditRules::WillOutputText(const nsAString* aOutputFormat,
-                                       nsAString* aOutString, uint32_t aFlags,
-                                       bool* aCancel, bool* aHandled) {
-  MOZ_ASSERT(IsEditorDataAvailable());
-
-  // null selection ok
-  if (NS_WARN_IF(!aOutString) || NS_WARN_IF(!aOutputFormat) ||
-      NS_WARN_IF(!aCancel) || NS_WARN_IF(!aHandled)) {
-    return NS_ERROR_NULL_POINTER;
-  }
-
-  // initialize out param
-  *aCancel = false;
-  *aHandled = false;
-
-  if (!aOutputFormat->LowerCaseEqualsLiteral("text/plain")) {
-    return NS_OK;
-  }
+EditActionResult TextEditor::ComputeValueFromTextNodeAndPaddingBRElement(
+    nsAString& aValue) const {
+  MOZ_ASSERT(IsEditActionDataAvailable());
 
   // If there is a padding <br> element, there's no content.  So output empty
   // string.
-  if (TextEditorRef().HasPaddingBRElementForEmptyEditor()) {
-    aOutString->Truncate();
-    *aHandled = true;
-    return NS_OK;
-  }
-
-  // If it's necessary to check selection range or the editor wraps hard,
-  // we need some complicated handling.  In such case, we need to use the
-  // expensive path.
-  // XXX Anything else what we cannot return plain text simply?
-  if (aFlags & nsIDocumentEncoder::OutputSelectionOnly ||
-      aFlags & nsIDocumentEncoder::OutputWrap) {
-    return NS_OK;
+  if (HasPaddingBRElementForEmptyEditor()) {
+    aValue.Truncate();
+    return EditActionHandled();
   }
 
   // If it's neither <input type="text"> nor <textarea>, e.g., an HTML editor
   // which is in plaintext mode (e.g., plaintext email composer on Thunderbird),
   // it should be handled by the expensive path.
-  if (TextEditorRef().AsHTMLEditor()) {
-    return NS_OK;
+  if (AsHTMLEditor()) {
+    return EditActionIgnored();
   }
 
-  Element* root = TextEditorRef().GetRoot();
-  if (!root) {  // Don't warn it, this is possible, e.g., 997805.html
-    aOutString->Truncate();
-    *aHandled = true;
-    return NS_OK;
+  Element* anonymousDivElement = GetRoot();
+  if (!anonymousDivElement) {
+    // Don't warn this case, this is possible, e.g., 997805.html
+    aValue.Truncate();
+    return EditActionHandled();
   }
 
-  nsIContent* firstChild = root->GetFirstChild();
-  if (!firstChild) {
-    aOutString->Truncate();
-    *aHandled = true;
-    return NS_OK;
+  nsIContent* textNodeOrPaddingBRElement = anonymousDivElement->GetFirstChild();
+  if (!textNodeOrPaddingBRElement) {
+    aValue.Truncate();
+    return EditActionHandled();
   }
 
   // If it's an <input type="text"> element, the DOM tree should be:
@@ -1066,9 +943,17 @@
   //   ...
   // </div>
 
-  Text* text = firstChild->GetAsText();
+  Text* textNode = textNodeOrPaddingBRElement->GetAsText();
+  if (!textNode) {
+    // If there is no text node in the expected DOM tree, we can say that it's
+    // just empty.
+    aValue.Truncate();
+    return EditActionHandled();
+  }
+
   nsIContent* firstChildExceptText =
-      text ? firstChild->GetNextSibling() : firstChild;
+      textNode ? textNodeOrPaddingBRElement->GetNextSibling()
+               : textNodeOrPaddingBRElement;
   // If the DOM tree is unexpected, fall back to the expensive path.
   bool isInput = IsSingleLineEditor();
   bool isTextarea = !isInput;
@@ -1078,22 +963,12 @@
                  !EditorBase::IsPaddingBRElementForEmptyLastLine(
                      *firstChildExceptText) &&
                  !firstChildExceptText->IsXULElement(nsGkAtoms::scrollbar))) {
-    return NS_OK;
-  }
-
-  // If there is no text node in the expected DOM tree, we can say that it's
-  // just empty.
-  if (!text) {
-    aOutString->Truncate();
-    *aHandled = true;
-    return NS_OK;
+    return EditActionIgnored();
   }
 
-  // Otherwise, the text is the value.
-  text->GetData(*aOutString);
-
-  *aHandled = true;
-  return NS_OK;
+  // Otherwise, the text data is the value.
+  textNode->GetData(aValue);
+  return EditActionHandled();
 }
 
 nsresult TextEditRules::CreateTrailingBRIfNeeded() {
@@ -1148,8 +1023,9 @@
 }
 
 EditActionResult TextEditor::TruncateInsertionStringForMaxLength(
-    nsAString& aInsertionString, uint32_t aMaxLength) {
+    nsAString& aInsertionString) {
   MOZ_ASSERT(IsEditActionDataAvailable());
+  MOZ_ASSERT(mMaxTextLength >= 0);
 
   if (!IsPlaintextEditor() || IsIMEComposing()) {
     return EditActionIgnored();
@@ -1175,16 +1051,17 @@
   //     is part of kOldCompositionStringLength.
   const uint32_t kNewLength =
       currentLength - kSelectionLength - kOldCompositionStringLength;
-  if (kNewLength >= aMaxLength) {
+  if (kNewLength >= static_cast<uint32_t>(mMaxTextLength)) {
     aInsertionString.Truncate();  // Too long, we cannot accept new character.
     return EditActionHandled();
   }
 
-  if (aInsertionString.Length() + kNewLength <= aMaxLength) {
+  if (aInsertionString.Length() + kNewLength <=
+      static_cast<uint32_t>(mMaxTextLength)) {
     return EditActionIgnored();  // Enough short string.
   }
 
-  int32_t newInsertionStringLength = aMaxLength - kNewLength;
+  int32_t newInsertionStringLength = mMaxTextLength - kNewLength;
   MOZ_ASSERT(newInsertionStringLength > 0);
   char16_t maybeHighSurrogate =
       aInsertionString.CharAt(newInsertionStringLength - 1);
@@ -1229,20 +1106,14 @@
   return mTextEditor ? mTextEditor->IsMailEditor() : false;
 }
 
-bool TextEditRules::DontEchoPassword() const {
-  if (!mTextEditor) {
-    // XXX Why do we use echo password if editor is null?
+bool TextEditor::CanEchoPasswordNow() const {
+  if (!LookAndFeel::GetEchoPassword() ||
+      (mFlags & nsIPlaintextEditor::eEditorDontEchoPassword)) {
     return false;
   }
-  if (!LookAndFeel::GetEchoPassword() || mTextEditor->DontEchoPassword()) {
-    return true;
-  }
 
-  if (mTextEditor->GetEditAction() != EditAction::eDrop &&
-      mTextEditor->GetEditAction() != EditAction::ePaste) {
-    return false;
-  }
-  return true;
+  return GetEditAction() != EditAction::eDrop &&
+         GetEditAction() != EditAction::ePaste;
 }
 
 }  // namespace mozilla
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/TextEditRules.h firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/TextEditRules.h
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/libeditor/TextEditRules.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/libeditor/TextEditRules.h	2019-09-15 11:33:10.000000000 +0000
@@ -102,56 +102,11 @@
  protected:
   virtual ~TextEditRules() = default;
 
- public:
-  /**
-   * Handles the newline characters according to the default system prefs
-   * (editor.singleLine.pasteNewlines).
-   * Each value means:
-   *   nsIPlaintextEditor::eNewlinesReplaceWithSpaces (2, Firefox default):
-   *     replace newlines with spaces.
-   *   nsIPlaintextEditor::eNewlinesStrip (3):
-   *     remove newlines from the string.
-   *   nsIPlaintextEditor::eNewlinesReplaceWithCommas (4, Thunderbird default):
-   *     replace newlines with commas.
-   *   nsIPlaintextEditor::eNewlinesStripSurroundingWhitespace (5):
-   *     collapse newlines and surrounding whitespace characters and
-   *     remove them from the string.
-   *   nsIPlaintextEditor::eNewlinesPasteIntact (0):
-   *     only remove the leading and trailing newlines.
-   *   nsIPlaintextEditor::eNewlinesPasteToFirst (1) or any other value:
-   *     remove the first newline and all characters following it.
-   *
-   * @param aString the string to be modified in place.
-   */
-  void HandleNewLines(nsString& aString);
-
- protected:
   void InitFields();
 
   // TextEditRules implementation methods
 
   /**
-   * Called before inserting text.
-   * This method may actually inserts text into the editor.  Therefore, this
-   * might cause destroying the editor.
-   *
-   * @param aEditSubAction      Must be EditSubAction::eInsertTextComingFromIME
-   *                            or EditSubAction::eInsertText.
-   * @param aCancel             Returns true if the operation is canceled.
-   * @param aHandled            Returns true if the edit action is handled.
-   * @param inString            String to be inserted.
-   * @param outString           String actually inserted.
-   * @param aMaxLength          The maximum string length which the editor
-   *                            allows to set.
-   */
-  MOZ_CAN_RUN_SCRIPT
-  MOZ_MUST_USE nsresult WillInsertText(EditSubAction aEditSubAction,
-                                       bool* aCancel, bool* aHandled,
-                                       const nsAString* inString,
-                                       nsAString* outString,
-                                       int32_t aMaxLength);
-
-  /**
    * Called before setting text to the text editor.
    * This method may actually set text to it.  Therefore, this might cause
    * destroying the text editor.
@@ -168,50 +123,6 @@
                                     int32_t aMaxLength);
 
   /**
-   * Called before deleting selected content.
-   * This method may actually remove the selected content with
-   * DeleteSelectionWithTransaction().  So, this might cause destroying the
-   * editor.
-   *
-   * @param aCaollapsedAction   Direction to extend the selection.
-   * @param aCancel             Returns true if the operation is canceled.
-   * @param aHandled            Returns true if the edit action is handled.
-   */
-  MOZ_CAN_RUN_SCRIPT
-  MOZ_MUST_USE nsresult WillDeleteSelection(
-      nsIEditor::EDirection aCollapsedAction, bool* aCancel, bool* aHandled);
-
-  /**
-   * DeleteSelectionWithTransaction() is internal method of
-   * WillDeleteSelection() since it needs to create SelectionBatcher in
-   * big scope and destroying it might causes destroying the editor.
-   * So, after calling this method, callers need to check CanHandleEditAction()
-   * manually.
-   *
-   * @param aCaollapsedAction   Direction to extend the selection.
-   * @param aCancel             Returns true if the operation is canceled.
-   * @param aHandled            Returns true if the edit action is handled.
-   */
-  MOZ_CAN_RUN_SCRIPT
-  MOZ_MUST_USE nsresult DeleteSelectionWithTransaction(
-      nsIEditor::EDirection aCollapsedAction, bool* aCancel, bool* aHandled);
-
-  nsresult WillSetTextProperty(bool* aCancel, bool* aHandled);
-
-  nsresult WillRemoveTextProperty(bool* aCancel, bool* aHandled);
-
-  /**
-   * Called prior to nsIEditor::OutputToString.
-   *
-   * @param aInFormat  The format requested for the output, a MIME type.
-   * @param aOutText   The string to use for output, if aCancel is set to true.
-   * @param aOutCancel If set to true, the caller should cancel the operation
-   *                   and use aOutText as the result.
-   */
-  nsresult WillOutputText(const nsAString* aInFormat, nsAString* aOutText,
-                          uint32_t aFlags, bool* aOutCancel, bool* aHandled);
-
-  /**
    * Creates a trailing break in the text doc if there is not one already.
    */
   MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult CreateTrailingBRIfNeeded();
@@ -317,14 +228,6 @@
   bool IsEditorDataAvailable() const { return !!mData; }
 #endif  // #ifdef DEBUG
 
-  /**
-   * GetTextNodeAroundSelectionStartContainer() may return a Text node around
-   * start container of Selection.  If current selection container is not
-   * a text node, this will look for descendants and next siblings of the
-   * container.
-   */
-  inline already_AddRefed<nsINode> GetTextNodeAroundSelectionStartContainer();
-
 #ifdef DEBUG
   bool mIsHandling;
 #endif  // #ifdef DEBUG
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/editor/nsIPlaintextEditor.idl firefox-trunk-71.0~a1~hg20190915r493291/editor/nsIPlaintextEditor.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/editor/nsIPlaintextEditor.idl	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/editor/nsIPlaintextEditor.idl	2019-09-15 11:33:10.000000000 +0000
@@ -86,6 +86,7 @@
    *
    * @param aString   the string to be inserted
    */
+   [can_run_script]
    void insertText(in AString aStringToInsert);
 
   /**
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/.eslintrc.js firefox-trunk-71.0~a1~hg20190915r493291/.eslintrc.js
--- firefox-trunk-71.0~a1~hg20190913r492975/.eslintrc.js	2019-09-13 05:13:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/.eslintrc.js	2019-09-15 11:33:06.000000000 +0000
@@ -336,5 +336,13 @@
     "rules": {
       "no-async-promise-executor": "off",
     }
+  },{
+    "files": [
+      "toolkit/**",
+      "browser/**",
+    ],
+    "rules": {
+      "mozilla/prefer-boolean-length-check": "error",
+    }
   }]
 };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/2D.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/2D.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/2D.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/2D.h	2019-09-15 11:33:10.000000000 +0000
@@ -57,6 +57,9 @@
 
 typedef int FT_Error;
 
+struct _FcPattern;
+typedef _FcPattern FcPattern;
+
 struct ID3D11Texture2D;
 struct ID3D11Device;
 struct ID2D1Device;
@@ -746,6 +749,79 @@
   Float mHeight;
 };
 
+#ifdef MOZ_ENABLE_FREETYPE
+class SharedFTFace;
+
+/** SharedFTFaceData abstracts data that may be used to back a SharedFTFace.
+ * Its main function is to manage the lifetime of the data and ensure that it
+ * lasts as long as the face.
+ */
+class SharedFTFaceData {
+ public:
+  /** Utility for creating a new face from this data. */
+  virtual already_AddRefed<SharedFTFace> CloneFace(int aFaceIndex = 0) {
+    return nullptr;
+  }
+  /** Binds the data's lifetime to the face. */
+  virtual void BindData() = 0;
+  /** Signals that the data is no longer needed by a face. */
+  virtual void ReleaseData() = 0;
+};
+
+/** Wrapper class for ref-counted SharedFTFaceData that handles calling the
+ * appropriate ref-counting methods
+ */
+template <class T>
+class SharedFTFaceRefCountedData : public SharedFTFaceData {
+ public:
+  void BindData() { static_cast<T*>(this)->AddRef(); }
+  void ReleaseData() { static_cast<T*>(this)->Release(); }
+};
+
+/** SharedFTFace is a shared wrapper around an FT_Face. It is ref-counted,
+ * unlike FT_Face itself, so that it may be shared among many users with
+ * RefPtr. Users should take care to lock SharedFTFace before accessing any
+ * FT_Face fields that may change to ensure exclusive access to it. It also
+ * allows backing data's lifetime to be bound to it via SharedFTFaceData so
+ * that the data will not disappear before the face does.
+ */
+class SharedFTFace : public external::AtomicRefCounted<SharedFTFace> {
+ public:
+  MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(SharedFTFace)
+
+  explicit SharedFTFace(FT_Face aFace, SharedFTFaceData* aData = nullptr);
+  virtual ~SharedFTFace();
+
+  FT_Face GetFace() const { return mFace; }
+  SharedFTFaceData* GetData() const { return mData; }
+
+  /** Locks the face for exclusive access by a given owner. Returns true if
+   * the given owner is acquiring the lock for the first time, and false if
+   * the owner was the prior owner of the lock. Thus the return value can be
+   * used to do owner-specific initialization of the FT face such as setting
+   * a size or transform that may have been invalidated by a previous owner.
+   * If no owner is given, then the user should avoid modify any state on
+   * the face so as not to invalidate the prior owner's modification.
+   */
+  bool Lock(void* aOwner = nullptr) {
+    mLock.Lock();
+    if (mLockOwner == aOwner || !aOwner) {
+      return true;
+    } else {
+      mLockOwner = aOwner;
+      return false;
+    }
+  }
+  void Unlock() { mLock.Unlock(); }
+
+ private:
+  FT_Face mFace;
+  SharedFTFaceData* mData;
+  Mutex mLock;
+  void* mLockOwner;
+};
+#endif
+
 class UnscaledFont : public SupportsThreadSafeWeakPtr<UnscaledFont> {
  public:
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(UnscaledFont)
@@ -813,7 +889,7 @@
 
   virtual FontType GetType() const = 0;
   virtual Float GetSize() const = 0;
-  virtual AntialiasMode GetDefaultAAMode();
+  virtual AntialiasMode GetDefaultAAMode() { return AntialiasMode::DEFAULT; }
 
   static uint32_t DeletionCounter() { return sDeletionCounter; }
 
@@ -1662,6 +1738,20 @@
       bool aApplySyntheticBold = false);
 #endif
 
+#ifdef MOZ_WIDGET_GTK
+  static already_AddRefed<ScaledFont> CreateScaledFontForFontconfigFont(
+      const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize,
+      cairo_scaled_font_t* aScaledFont, RefPtr<SharedFTFace> aFace,
+      FcPattern* aPattern);
+#endif
+
+#ifdef MOZ_WIDGET_ANDROID
+  static already_AddRefed<ScaledFont> CreateScaledFontForFreeTypeFont(
+      const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize,
+      cairo_scaled_font_t* aScaledFont, RefPtr<SharedFTFace> aFace,
+      bool aApplySyntheticBold = false);
+#endif
+
   /**
    * This creates a NativeFontResource from TrueType data.
    *
@@ -1799,8 +1889,14 @@
 
   static FT_Face NewFTFace(FT_Library aFTLibrary, const char* aFileName,
                            int aFaceIndex);
+  static already_AddRefed<SharedFTFace> NewSharedFTFace(FT_Library aFTLibrary,
+                                                        const char* aFilename,
+                                                        int aFaceIndex);
   static FT_Face NewFTFaceFromData(FT_Library aFTLibrary, const uint8_t* aData,
                                    size_t aDataSize, int aFaceIndex);
+  static already_AddRefed<SharedFTFace> NewSharedFTFaceFromData(
+      FT_Library aFTLibrary, const uint8_t* aData, size_t aDataSize,
+      int aFaceIndex, SharedFTFaceData* aSharedData = nullptr);
   static void ReleaseFTFace(FT_Face aFace);
   static FT_Error LoadFTGlyph(FT_Face aFace, uint32_t aGlyphIndex,
                               int32_t aFlags);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/DrawTargetSkia.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/DrawTargetSkia.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/DrawTargetSkia.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/DrawTargetSkia.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -911,29 +911,6 @@
   mCanvas->drawPath(skiaPath->GetPath(), paint.mPaint);
 }
 
-bool DrawTargetSkia::ShouldLCDRenderText(FontType aFontType,
-                                         AntialiasMode aAntialiasMode) {
-  // Only allow subpixel AA if explicitly permitted.
-  if (!GetPermitSubpixelAA()) {
-    return false;
-  }
-
-  if (aAntialiasMode == AntialiasMode::DEFAULT) {
-    switch (aFontType) {
-      case FontType::MAC:
-      case FontType::GDI:
-      case FontType::DWRITE:
-      case FontType::FONTCONFIG:
-        return true;
-      case FontType::FREETYPE:
-      default:
-        // TODO: Figure out what to do for the other platforms.
-        return false;
-    }
-  }
-  return (aAntialiasMode == AntialiasMode::SUBPIXEL);
-}
-
 #ifdef MOZ_WIDGET_COCOA
 static inline CGAffineTransform GfxMatrixToCGAffineTransform(const Matrix& m) {
   CGAffineTransform t;
@@ -1321,56 +1298,14 @@
 
   SkFont font(sk_ref_sp(typeface), SkFloatToScalar(skiaFont->mSize));
 
-  bool useSubpixelAA = ShouldLCDRenderText(aFont->GetType(), aaMode);
+  bool useSubpixelAA =
+      GetPermitSubpixelAA() &&
+      (aaMode == AntialiasMode::DEFAULT || aaMode == AntialiasMode::SUBPIXEL);
   font.setEdging(useSubpixelAA ? SkFont::Edging::kSubpixelAntiAlias
                                : (aaEnabled ? SkFont::Edging::kAntiAlias
                                             : SkFont::Edging::kAlias));
 
-  bool useSubpixelText = true;
-  switch (aFont->GetType()) {
-    case FontType::FREETYPE:
-    case FontType::FONTCONFIG:
-      // SkFontHost_cairo does not support subpixel text positioning,
-      // so only enable it for other font hosts.
-      useSubpixelText = false;
-      break;
-    case FontType::MAC:
-      if (aaMode == AntialiasMode::GRAY) {
-        // Normally, Skia enables LCD FontSmoothing which creates thicker fonts
-        // and also enables subpixel AA. CoreGraphics without font smoothing
-        // explicitly creates thinner fonts and grayscale AA.
-        // CoreGraphics doesn't support a configuration that produces thicker
-        // fonts with grayscale AA as LCD Font Smoothing enables or disables
-        // both. However, Skia supports it by enabling font smoothing (producing
-        // subpixel AA) and converts it to grayscale AA. Since Skia doesn't
-        // support subpixel AA on transparent backgrounds, we still want font
-        // smoothing for the thicker fonts, even if it is grayscale AA.
-        //
-        // With explicit Grayscale AA (from -moz-osx-font-smoothing:grayscale),
-        // we want to have grayscale AA with no smoothing at all. This means
-        // disabling the LCD font smoothing behaviour.
-        // To accomplish this we have to explicitly disable hinting,
-        // and disable LCDRenderText.
-        font.setHinting(kNo_SkFontHinting);
-      }
-      break;
-#ifdef XP_WIN
-    case FontType::DWRITE: {
-      ScaledFontDWrite* dwriteFont = static_cast<ScaledFontDWrite*>(aFont);
-      if (dwriteFont->ForceGDIMode()) {
-        font.setEmbeddedBitmaps(true);
-        useSubpixelText = false;
-      } else {
-        font.setEmbeddedBitmaps(dwriteFont->UseEmbeddedBitmaps());
-      }
-      break;
-    }
-#endif
-    default:
-      break;
-  }
-
-  font.setSubpixel(useSubpixelText);
+  skiaFont->SetupSkFontDrawOptions(font);
 
   // Limit the amount of internal batch allocations Skia does.
   const uint32_t kMaxGlyphBatchSize = 8192;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/DrawTargetSkia.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/DrawTargetSkia.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/DrawTargetSkia.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/DrawTargetSkia.h	2019-09-15 11:33:10.000000000 +0000
@@ -147,8 +147,6 @@
 
   void MarkChanged();
 
-  bool ShouldLCDRenderText(FontType aFontType, AntialiasMode aAntialiasMode);
-
   void DrawGlyphs(ScaledFont* aFont, const GlyphBuffer& aBuffer,
                   const Pattern& aPattern,
                   const StrokeOptions* aStrokeOptions = nullptr,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/Factory.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/Factory.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/Factory.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/Factory.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -157,19 +157,24 @@
 #ifdef MOZ_ENABLE_FREETYPE
 extern "C" {
 
-FT_Face mozilla_NewFTFace(FT_Library aFTLibrary, const char* aFileName,
-                          int aFaceIndex) {
-  return mozilla::gfx::Factory::NewFTFace(aFTLibrary, aFileName, aFaceIndex);
+void mozilla_AddRefSharedFTFace(void* aContext) {
+  if (aContext) {
+    static_cast<mozilla::gfx::SharedFTFace*>(aContext)->AddRef();
+  }
+}
+
+void mozilla_ReleaseSharedFTFace(void* aContext) {
+  if (aContext) {
+    static_cast<mozilla::gfx::SharedFTFace*>(aContext)->Release();
+  }
 }
 
-FT_Face mozilla_NewFTFaceFromData(FT_Library aFTLibrary, const uint8_t* aData,
-                                  size_t aDataSize, int aFaceIndex) {
-  return mozilla::gfx::Factory::NewFTFaceFromData(aFTLibrary, aData, aDataSize,
-                                                  aFaceIndex);
+int mozilla_LockSharedFTFace(void* aContext, void* aOwner) {
+  return int(static_cast<mozilla::gfx::SharedFTFace*>(aContext)->Lock(aOwner));
 }
 
-void mozilla_ReleaseFTFace(FT_Face aFace) {
-  mozilla::gfx::Factory::ReleaseFTFace(aFace);
+void mozilla_UnlockSharedFTFace(void* aContext) {
+  static_cast<mozilla::gfx::SharedFTFace*>(aContext)->Unlock();
 }
 
 FT_Error mozilla_LoadFTGlyph(FT_Face aFace, uint32_t aGlyphIndex,
@@ -554,16 +559,6 @@
 #  endif
       return font.forget();
     }
-#elif defined(MOZ_WIDGET_GTK)
-    case NativeFontType::FONTCONFIG_PATTERN:
-      return MakeAndAddRef<ScaledFontFontconfig>(
-          aScaledFont, static_cast<FcPattern*>(aNativeFont.mFont),
-          aUnscaledFont, aSize);
-#elif defined(MOZ_WIDGET_ANDROID)
-    case NativeFontType::FREETYPE_FACE:
-      return MakeAndAddRef<ScaledFontFreeType>(
-          aScaledFont, static_cast<FT_Face>(aNativeFont.mFont), aUnscaledFont,
-          aSize);
 #endif
     default:
       gfxWarning() << "Invalid native font type specified.";
@@ -634,6 +629,26 @@
 }
 #endif
 
+#ifdef MOZ_WIDGET_GTK
+already_AddRefed<ScaledFont> Factory::CreateScaledFontForFontconfigFont(
+    const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize,
+    cairo_scaled_font_t* aScaledFont, RefPtr<SharedFTFace> aFace,
+    FcPattern* aPattern) {
+  return MakeAndAddRef<ScaledFontFontconfig>(aScaledFont, std::move(aFace),
+                                             aPattern, aUnscaledFont, aSize);
+}
+#endif
+
+#ifdef MOZ_WIDGET_ANDROID
+already_AddRefed<ScaledFont> Factory::CreateScaledFontForFreeTypeFont(
+    const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize,
+    cairo_scaled_font_t* aScaledFont, RefPtr<SharedFTFace> aFace,
+    bool aApplySyntheticBold) {
+  return MakeAndAddRef<ScaledFontFreeType>(
+      aScaledFont, std::move(aFace), aUnscaledFont, aSize, aApplySyntheticBold);
+}
+#endif
+
 already_AddRefed<DrawTarget> Factory::CreateDualDrawTarget(
     DrawTarget* targetA, DrawTarget* targetB) {
   MOZ_ASSERT(targetA && targetB);
@@ -663,6 +678,23 @@
 bool Factory::GetBGRSubpixelOrder() { return mBGRSubpixelOrder; }
 
 #ifdef MOZ_ENABLE_FREETYPE
+SharedFTFace::SharedFTFace(FT_Face aFace, SharedFTFaceData* aData)
+    : mFace(aFace),
+      mData(aData),
+      mLock("SharedFTFace::mLock"),
+      mLockOwner(nullptr) {
+  if (mData) {
+    mData->BindData();
+  }
+}
+
+SharedFTFace::~SharedFTFace() {
+  Factory::ReleaseFTFace(mFace);
+  if (mData) {
+    mData->ReleaseData();
+  }
+}
+
 void Factory::SetFTLibrary(FT_Library aFTLibrary) { mFTLibrary = aFTLibrary; }
 
 FT_Library Factory::GetFTLibrary() {
@@ -699,6 +731,16 @@
   return face;
 }
 
+already_AddRefed<SharedFTFace> Factory::NewSharedFTFace(FT_Library aFTLibrary,
+                                                        const char* aFilename,
+                                                        int aFaceIndex) {
+  if (FT_Face face = NewFTFace(aFTLibrary, aFilename, aFaceIndex)) {
+    return MakeAndAddRef<SharedFTFace>(face);
+  } else {
+    return nullptr;
+  }
+}
+
 FT_Face Factory::NewFTFaceFromData(FT_Library aFTLibrary, const uint8_t* aData,
                                    size_t aDataSize, int aFaceIndex) {
   StaticMutexAutoLock lock(mFTLock);
@@ -713,6 +755,17 @@
   return face;
 }
 
+already_AddRefed<SharedFTFace> Factory::NewSharedFTFaceFromData(
+    FT_Library aFTLibrary, const uint8_t* aData, size_t aDataSize,
+    int aFaceIndex, SharedFTFaceData* aSharedData) {
+  if (FT_Face face =
+          NewFTFaceFromData(aFTLibrary, aData, aDataSize, aFaceIndex)) {
+    return MakeAndAddRef<SharedFTFace>(face, aSharedData);
+  } else {
+    return nullptr;
+  }
+}
+
 void Factory::ReleaseFTFace(FT_Face aFace) {
   StaticMutexAutoLock lock(mFTLock);
   FT_Done_Face(aFace);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/HelpersWinFonts.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/HelpersWinFonts.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/HelpersWinFonts.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/HelpersWinFonts.h	2019-09-15 11:33:10.000000000 +0000
@@ -4,8 +4,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/StaticPrefs_gfx.h"
-
 namespace mozilla {
 namespace gfx {
 
@@ -15,9 +13,6 @@
 
 static AntialiasMode GetSystemDefaultAAMode() {
   AntialiasMode defaultMode = AntialiasMode::SUBPIXEL;
-  if (StaticPrefs::gfx_text_disable_aa_AtStartup()) {
-    return AntialiasMode::NONE;
-  }
 
   switch (GetSystemTextQuality()) {
     case CLEARTYPE_QUALITY:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/NativeFontResourceDWrite.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/NativeFontResourceDWrite.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/NativeFontResourceDWrite.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/NativeFontResourceDWrite.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -260,8 +260,8 @@
     return nullptr;
   }
 
-  RefPtr<UnscaledFont> unscaledFont = new UnscaledFontDWrite(
-      fontFace, nullptr, DWRITE_FONT_SIMULATIONS_NONE, mNeedsCairo);
+  RefPtr<UnscaledFont> unscaledFont =
+      new UnscaledFontDWrite(fontFace, nullptr, mNeedsCairo);
 
   return unscaledFont.forget();
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/NativeFontResourceFreeType.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/NativeFontResourceFreeType.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/NativeFontResourceFreeType.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/NativeFontResourceFreeType.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -12,15 +12,13 @@
 namespace gfx {
 
 NativeFontResourceFreeType::NativeFontResourceFreeType(
-    UniquePtr<uint8_t[]>&& aFontData, uint32_t aDataLength, FT_Face aFace)
-    : mFontData(std::move(aFontData)), mDataLength(aDataLength), mFace(aFace) {}
+    UniquePtr<uint8_t[]>&& aFontData, uint32_t aDataLength,
+    FT_Library aFTLibrary)
+    : mFontData(std::move(aFontData)),
+      mDataLength(aDataLength),
+      mFTLibrary(aFTLibrary) {}
 
-NativeFontResourceFreeType::~NativeFontResourceFreeType() {
-  if (mFace) {
-    Factory::ReleaseFTFace(mFace);
-    mFace = nullptr;
-  }
-}
+NativeFontResourceFreeType::~NativeFontResourceFreeType() {}
 
 template <class T>
 already_AddRefed<T> NativeFontResourceFreeType::CreateInternal(
@@ -34,18 +32,7 @@
   }
   memcpy(fontData.get(), aFontData, aDataLength);
 
-  FT_Face face =
-      Factory::NewFTFaceFromData(aFTLibrary, fontData.get(), aDataLength, 0);
-  if (!face) {
-    return nullptr;
-  }
-  if (FT_Select_Charmap(face, FT_ENCODING_UNICODE) != FT_Err_Ok &&
-      FT_Select_Charmap(face, FT_ENCODING_MS_SYMBOL) != FT_Err_Ok) {
-    Factory::ReleaseFTFace(face);
-    return nullptr;
-  }
-
-  RefPtr<T> resource = new T(std::move(fontData), aDataLength, face);
+  RefPtr<T> resource = new T(std::move(fontData), aDataLength, aFTLibrary);
   return resource.forget();
 }
 
@@ -59,26 +46,40 @@
 already_AddRefed<UnscaledFont> NativeFontResourceFreeType::CreateUnscaledFont(
     uint32_t aIndex, const uint8_t* aInstanceData,
     uint32_t aInstanceDataLength) {
-  RefPtr<UnscaledFont> unscaledFont = new UnscaledFontFreeType(mFace, this);
-  return unscaledFont.forget();
+  if (RefPtr<SharedFTFace> face = CloneFace()) {
+    return MakeAndAddRef<UnscaledFontFreeType>(std::move(face));
+  }
+  return nullptr;
 }
 #endif
 
-FT_Face NativeFontResourceFreeType::CloneFace() {
-  return Factory::NewFTFaceFromData(mFace->glyph->library, mFontData.get(),
-                                    mDataLength, 0);
+already_AddRefed<SharedFTFace> NativeFontResourceFreeType::CloneFace(
+    int aFaceIndex) {
+  RefPtr<SharedFTFace> face = Factory::NewSharedFTFaceFromData(
+      mFTLibrary, mFontData.get(), mDataLength, aFaceIndex, this);
+  if (!face ||
+      (FT_Select_Charmap(face->GetFace(), FT_ENCODING_UNICODE) != FT_Err_Ok &&
+       FT_Select_Charmap(face->GetFace(), FT_ENCODING_MS_SYMBOL) !=
+           FT_Err_Ok)) {
+    return nullptr;
+  }
+  return face.forget();
 }
 
 #ifdef MOZ_WIDGET_GTK
 NativeFontResourceFontconfig::NativeFontResourceFontconfig(
-    UniquePtr<uint8_t[]>&& aFontData, uint32_t aDataLength, FT_Face aFace)
-    : NativeFontResourceFreeType(std::move(aFontData), aDataLength, aFace) {}
+    UniquePtr<uint8_t[]>&& aFontData, uint32_t aDataLength,
+    FT_Library aFTLibrary)
+    : NativeFontResourceFreeType(std::move(aFontData), aDataLength,
+                                 aFTLibrary) {}
 
 already_AddRefed<UnscaledFont> NativeFontResourceFontconfig::CreateUnscaledFont(
     uint32_t aIndex, const uint8_t* aInstanceData,
     uint32_t aInstanceDataLength) {
-  RefPtr<UnscaledFont> unscaledFont = new UnscaledFontFontconfig(mFace, this);
-  return unscaledFont.forget();
+  if (RefPtr<SharedFTFace> face = CloneFace()) {
+    return MakeAndAddRef<UnscaledFontFontconfig>(std::move(face));
+  }
+  return nullptr;
 }
 
 already_AddRefed<NativeFontResourceFontconfig>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/NativeFontResourceFreeType.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/NativeFontResourceFreeType.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/NativeFontResourceFreeType.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/NativeFontResourceFreeType.h	2019-09-15 11:33:10.000000000 +0000
@@ -15,7 +15,9 @@
 namespace mozilla {
 namespace gfx {
 
-class NativeFontResourceFreeType : public NativeFontResource {
+class NativeFontResourceFreeType
+    : public NativeFontResource,
+      public SharedFTFaceRefCountedData<NativeFontResourceFreeType> {
  public:
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(NativeFontResourceFreeType, override)
 
@@ -31,11 +33,12 @@
 
   ~NativeFontResourceFreeType();
 
-  FT_Face CloneFace();
+  already_AddRefed<SharedFTFace> CloneFace(int aFaceIndex = 0) override;
 
  protected:
   NativeFontResourceFreeType(UniquePtr<uint8_t[]>&& aFontData,
-                             uint32_t aDataLength, FT_Face aFace);
+                             uint32_t aDataLength,
+                             FT_Library aFTLibrary = nullptr);
 
   template <class T>
   static already_AddRefed<T> CreateInternal(uint8_t* aFontData,
@@ -44,7 +47,7 @@
 
   UniquePtr<uint8_t[]> mFontData;
   uint32_t mDataLength;
-  FT_Face mFace;
+  FT_Library mFTLibrary;
 };
 
 #ifdef MOZ_WIDGET_GTK
@@ -65,7 +68,8 @@
   friend class NativeFontResourceFreeType;
 
   NativeFontResourceFontconfig(UniquePtr<uint8_t[]>&& aFontData,
-                               uint32_t aDataLength, FT_Face aFace);
+                               uint32_t aDataLength,
+                               FT_Library aFTLibrary = nullptr);
 };
 #endif
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontBase.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontBase.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontBase.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontBase.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -6,8 +6,6 @@
 
 #include "ScaledFontBase.h"
 
-#include "mozilla/StaticPrefs_gfx.h"
-
 #ifdef USE_SKIA
 #  include "PathSkia.h"
 #  include "skia/include/core/SkFont.h"
@@ -33,14 +31,6 @@
 
 ScaledFont::~ScaledFont() { sDeletionCounter++; }
 
-AntialiasMode ScaledFont::GetDefaultAAMode() {
-  if (StaticPrefs::gfx_text_disable_aa_AtStartup()) {
-    return AntialiasMode::NONE;
-  }
-
-  return AntialiasMode::DEFAULT;
-}
-
 ScaledFontBase::~ScaledFontBase() {
 #ifdef USE_SKIA
   SkSafeUnref<SkTypeface>(mTypeface);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontBase.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontBase.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontBase.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontBase.h	2019-09-15 11:33:10.000000000 +0000
@@ -15,6 +15,7 @@
 #endif
 
 #ifdef USE_SKIA
+#  include "skia/include/core/SkFont.h"
 #  include "skia/include/core/SkPath.h"
 #  include "skia/include/core/SkTypeface.h"
 #endif
@@ -47,6 +48,7 @@
 
 #ifdef USE_SKIA
   SkTypeface* GetSkTypeface();
+  virtual void SetupSkFontDrawOptions(SkFont& aFont) {}
 #endif
 
 #ifdef USE_CAIRO_SCALED_FONT
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontDWrite.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontDWrite.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontDWrite.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontDWrite.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -12,6 +12,7 @@
 #include "mozilla/FontPropertyTypes.h"
 #include "mozilla/webrender/WebRenderTypes.h"
 #include "HelpersD2D.h"
+#include "StackArray.h"
 
 #include "dwrite_3.h"
 
@@ -184,6 +185,16 @@
   return SkCreateTypefaceFromDWriteFont(factory, mFontFace, mStyle,
                                         mRenderingMode, gamma, contrast);
 }
+
+void ScaledFontDWrite::SetupSkFontDrawOptions(SkFont& aFont) {
+  if (ForceGDIMode()) {
+    aFont.setEmbeddedBitmaps(true);
+    aFont.setSubpixel(false);
+  } else {
+    aFont.setEmbeddedBitmaps(UseEmbeddedBitmaps());
+    aFont.setSubpixel(true);
+  }
+}
 #endif
 
 void ScaledFontDWrite::CopyGlyphsToBuilder(const GlyphBuffer& aBuffer,
@@ -414,6 +425,7 @@
     const wr::FontInstanceOptions* aOptions,
     const wr::FontInstancePlatformOptions* aPlatformOptions)
     : mUseEmbeddedBitmap(false),
+      mApplySyntheticBold(false),
       mRenderingMode(DWRITE_RENDERING_MODE_DEFAULT),
       mGamma(2.2f),
       mContrast(1.0f) {
@@ -421,6 +433,9 @@
     if (aOptions->flags & wr::FontInstanceFlags_EMBEDDED_BITMAPS) {
       mUseEmbeddedBitmap = true;
     }
+    if (aOptions->flags & wr::FontInstanceFlags_SYNTHETIC_BOLD) {
+      mApplySyntheticBold = true;
+    }
     if (aOptions->flags & wr::FontInstanceFlags_FORCE_GDI) {
       mRenderingMode = DWRITE_RENDERING_MODE_GDI_CLASSIC;
     } else if (aOptions->flags & wr::FontInstanceFlags_FORCE_SYMMETRIC) {
@@ -495,7 +510,7 @@
   wr::FontInstanceOptions options;
   options.render_mode = wr::ToFontRenderMode(GetDefaultAAMode());
   options.flags = wr::FontInstanceFlags{0};
-  if (mFontFace->GetSimulations() & DWRITE_FONT_SIMULATIONS_BOLD) {
+  if (HasSyntheticBold()) {
     options.flags |= wr::FontInstanceFlags_SYNTHETIC_BOLD;
   }
   if (UseEmbeddedBitmaps()) {
@@ -540,8 +555,8 @@
 // given IDWriteFontFace, with specified variation-axis values applied.
 // Returns nullptr in case of failure.
 static already_AddRefed<IDWriteFontFace5> CreateFaceWithVariations(
-    IDWriteFontFace* aFace, const FontVariation* aVariations,
-    uint32_t aNumVariations) {
+    IDWriteFontFace* aFace, DWRITE_FONT_SIMULATIONS aSimulations,
+    const FontVariation* aVariations = nullptr, uint32_t aNumVariations = 0) {
   auto makeDWriteAxisTag = [](uint32_t aTag) {
     return DWRITE_MAKE_FONT_AXIS_TAG((aTag >> 24) & 0xff, (aTag >> 16) & 0xff,
                                      (aTag >> 8) & 0xff, aTag & 0xff);
@@ -554,22 +569,31 @@
     return nullptr;
   }
 
-  DWRITE_FONT_SIMULATIONS sims = aFace->GetSimulations();
   RefPtr<IDWriteFontResource> res;
   if (FAILED(ff5->GetFontResource(getter_AddRefs(res)))) {
     return nullptr;
   }
 
   std::vector<DWRITE_FONT_AXIS_VALUE> fontAxisValues;
-  fontAxisValues.reserve(aNumVariations);
-  for (uint32_t i = 0; i < aNumVariations; i++) {
-    DWRITE_FONT_AXIS_VALUE axisValue = {makeDWriteAxisTag(aVariations[i].mTag),
-                                        aVariations[i].mValue};
-    fontAxisValues.push_back(axisValue);
+  if (aNumVariations) {
+    fontAxisValues.reserve(aNumVariations);
+    for (uint32_t i = 0; i < aNumVariations; i++) {
+      DWRITE_FONT_AXIS_VALUE axisValue = {
+          makeDWriteAxisTag(aVariations[i].mTag), aVariations[i].mValue};
+      fontAxisValues.push_back(axisValue);
+    }
+  } else {
+    uint32_t count = ff5->GetFontAxisValueCount();
+    if (count) {
+      fontAxisValues.resize(count);
+      if (FAILED(ff5->GetFontAxisValues(fontAxisValues.data(), count))) {
+        fontAxisValues.clear();
+      }
+    }
   }
 
   RefPtr<IDWriteFontFace5> newFace;
-  if (FAILED(res->CreateFontFace(sims, fontAxisValues.data(),
+  if (FAILED(res->CreateFontFace(aSimulations, fontAxisValues.data(),
                                  fontAxisValues.size(),
                                  getter_AddRefs(newFace)))) {
     return nullptr;
@@ -578,6 +602,43 @@
   return newFace.forget();
 }
 
+bool UnscaledFontDWrite::InitBold() {
+  if (mFontFaceBold) {
+    return true;
+  }
+
+  DWRITE_FONT_SIMULATIONS sims = mFontFace->GetSimulations();
+  if (sims & DWRITE_FONT_SIMULATIONS_BOLD) {
+    mFontFaceBold = mFontFace;
+    return true;
+  }
+  sims |= DWRITE_FONT_SIMULATIONS_BOLD;
+
+  RefPtr<IDWriteFontFace5> ff5 = CreateFaceWithVariations(mFontFace, sims);
+  if (ff5) {
+    mFontFaceBold = ff5;
+  } else {
+    UINT32 numFiles = 0;
+    if (FAILED(mFontFace->GetFiles(&numFiles, nullptr))) {
+      return false;
+    }
+    StackArray<IDWriteFontFile*, 1> files(numFiles);
+    if (FAILED(mFontFace->GetFiles(&numFiles, files.data()))) {
+      return false;
+    }
+    HRESULT hr = Factory::GetDWriteFactory()->CreateFontFace(
+        mFontFace->GetType(), numFiles, files.data(), mFontFace->GetIndex(),
+        sims, getter_AddRefs(mFontFaceBold));
+    for (UINT32 i = 0; i < numFiles; ++i) {
+      files[i]->Release();
+    }
+    if (FAILED(hr) || !mFontFaceBold) {
+      return false;
+    }
+  }
+  return true;
+}
+
 already_AddRefed<ScaledFont> UnscaledFontDWrite::CreateScaledFont(
     Float aGlyphSize, const uint8_t* aInstanceData,
     uint32_t aInstanceDataLength, const FontVariation* aVariations,
@@ -590,12 +651,21 @@
       *reinterpret_cast<const ScaledFontDWrite::InstanceData*>(aInstanceData);
 
   IDWriteFontFace* face = mFontFace;
+  if (instanceData.mApplySyntheticBold) {
+    if (!InitBold()) {
+      gfxWarning() << "Failed creating bold IDWriteFontFace.";
+      return nullptr;
+    }
+    face = mFontFaceBold;
+  }
+  DWRITE_FONT_SIMULATIONS sims = face->GetSimulations();
 
   // If variations are required, we create a separate IDWriteFontFace5 with
   // the requested settings applied.
   RefPtr<IDWriteFontFace5> ff5;
   if (aNumVariations) {
-    ff5 = CreateFaceWithVariations(mFontFace, aVariations, aNumVariations);
+    ff5 =
+        CreateFaceWithVariations(mFontFace, sims, aVariations, aNumVariations);
     if (ff5) {
       face = ff5;
     } else {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontDWrite.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontDWrite.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontDWrite.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontDWrite.h	2019-09-15 11:33:10.000000000 +0000
@@ -68,8 +68,13 @@
   }
   DWRITE_RENDERING_MODE GetRenderingMode() const { return mRenderingMode; }
 
+  bool HasSyntheticBold() const {
+    return (mFontFace->GetSimulations() & DWRITE_FONT_SIMULATIONS_BOLD) != 0;
+  }
+
 #ifdef USE_SKIA
   SkTypeface* CreateSkTypeface() override;
+  void SetupSkFontDrawOptions(SkFont& aFont) override;
   SkFontStyle mStyle;
 #endif
 
@@ -98,6 +103,7 @@
   struct InstanceData {
     explicit InstanceData(ScaledFontDWrite* aScaledFont)
         : mUseEmbeddedBitmap(aScaledFont->mUseEmbeddedBitmap),
+          mApplySyntheticBold(aScaledFont->HasSyntheticBold()),
           mRenderingMode(aScaledFont->mRenderingMode),
           mGamma(aScaledFont->mGamma),
           mContrast(aScaledFont->mContrast) {}
@@ -106,6 +112,7 @@
                  const wr::FontInstancePlatformOptions* aPlatformOptions);
 
     bool mUseEmbeddedBitmap;
+    bool mApplySyntheticBold;
     DWRITE_RENDERING_MODE mRenderingMode;
     Float mGamma;
     Float mContrast;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontFontconfig.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontFontconfig.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontFontconfig.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontFontconfig.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -8,15 +8,16 @@
 #include "UnscaledFontFreeType.h"
 #include "NativeFontResourceFreeType.h"
 #include "Logging.h"
-#include "StackArray.h"
 #include "mozilla/webrender/WebRenderTypes.h"
 
 #ifdef USE_SKIA
 #  include "skia/include/ports/SkTypeface_cairo.h"
+#  include "HelpersSkia.h"
 #endif
 
 #include <fontconfig/fcfreetype.h>
 
+#include FT_LCD_FILTER_H
 #include FT_MULTIPLE_MASTERS_H
 
 namespace mozilla {
@@ -27,68 +28,76 @@
 // This is mainly because FT_Face is not good for sharing between libraries,
 // which is a requirement when we consider runtime switchable backends and so on
 ScaledFontFontconfig::ScaledFontFontconfig(
-    cairo_scaled_font_t* aScaledFont, FcPattern* aPattern,
-    const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize)
-    : ScaledFontBase(aUnscaledFont, aSize), mPattern(aPattern) {
+    cairo_scaled_font_t* aScaledFont, RefPtr<SharedFTFace>&& aFace,
+    FcPattern* aPattern, const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize)
+    : ScaledFontBase(aUnscaledFont, aSize),
+      mFace(std::move(aFace)),
+      mInstanceData(aScaledFont, aPattern) {
   SetCairoScaledFont(aScaledFont);
-  FcPatternReference(aPattern);
 }
 
-ScaledFontFontconfig::~ScaledFontFontconfig() { FcPatternDestroy(mPattern); }
+ScaledFontFontconfig::ScaledFontFontconfig(
+    cairo_scaled_font_t* aScaledFont, RefPtr<SharedFTFace>&& aFace,
+    const InstanceData& aInstanceData,
+    const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize)
+    : ScaledFontBase(aUnscaledFont, aSize),
+      mFace(std::move(aFace)),
+      mInstanceData(aInstanceData) {
+  SetCairoScaledFont(aScaledFont);
+}
 
 #ifdef USE_SKIA
 SkTypeface* ScaledFontFontconfig::CreateSkTypeface() {
-  return SkCreateTypefaceFromCairoFTFontWithFontconfig(mScaledFont, mPattern);
+  SkPixelGeometry geo = mInstanceData.mFlags & InstanceData::SUBPIXEL_BGR
+                            ? (mInstanceData.mFlags & InstanceData::LCD_VERTICAL
+                                   ? kBGR_V_SkPixelGeometry
+                                   : kBGR_H_SkPixelGeometry)
+                            : (mInstanceData.mFlags & InstanceData::LCD_VERTICAL
+                                   ? kRGB_V_SkPixelGeometry
+                                   : kRGB_H_SkPixelGeometry);
+  return SkCreateTypefaceFromCairoFTFont(mFace->GetFace(), mFace.get(), geo,
+                                         mInstanceData.mLcdFilter);
+}
+
+void ScaledFontFontconfig::SetupSkFontDrawOptions(SkFont& aFont) {
+  // SkFontHost_cairo does not support subpixel text positioning
+  aFont.setSubpixel(false);
+
+  if (mInstanceData.mFlags & InstanceData::AUTOHINT) {
+    aFont.setForceAutoHinting(true);
+  }
+  if (mInstanceData.mFlags & InstanceData::EMBEDDED_BITMAP) {
+    aFont.setEmbeddedBitmaps(true);
+  }
+  if (mInstanceData.mFlags & InstanceData::EMBOLDEN) {
+    aFont.setEmbolden(true);
+  }
+
+  aFont.setHinting(GfxHintingToSkiaHinting(mInstanceData.mHinting));
 }
 #endif
 
+AntialiasMode ScaledFontFontconfig::GetDefaultAAMode() {
+  return mInstanceData.mAntialias;
+}
+
 ScaledFontFontconfig::InstanceData::InstanceData(
     cairo_scaled_font_t* aScaledFont, FcPattern* aPattern)
     : mFlags(0),
-      mHintStyle(FC_HINT_NONE),
-      mSubpixelOrder(FC_RGBA_UNKNOWN),
-      mLcdFilter(FC_LCD_LEGACY) {
+      mAntialias(AntialiasMode::NONE),
+      mHinting(FontHinting::NONE),
+      mLcdFilter(FT_LCD_FILTER_LEGACY) {
   // Record relevant Fontconfig properties into instance data.
   FcBool autohint;
   if (FcPatternGetBool(aPattern, FC_AUTOHINT, 0, &autohint) == FcResultMatch &&
       autohint) {
     mFlags |= AUTOHINT;
   }
-  FcBool bitmap;
-  if (FcPatternGetBool(aPattern, FC_EMBEDDED_BITMAP, 0, &bitmap) ==
-          FcResultMatch &&
-      bitmap) {
-    mFlags |= EMBEDDED_BITMAP;
-  }
   FcBool embolden;
   if (FcPatternGetBool(aPattern, FC_EMBOLDEN, 0, &embolden) == FcResultMatch &&
       embolden) {
     mFlags |= EMBOLDEN;
   }
-  FcBool vertical;
-  if (FcPatternGetBool(aPattern, FC_VERTICAL_LAYOUT, 0, &vertical) ==
-          FcResultMatch &&
-      vertical) {
-    mFlags |= VERTICAL_LAYOUT;
-  }
-
-  FcBool antialias;
-  if (FcPatternGetBool(aPattern, FC_ANTIALIAS, 0, &antialias) !=
-          FcResultMatch ||
-      antialias) {
-    mFlags |= ANTIALIAS;
-
-    // Only record subpixel order and lcd filtering if antialiasing is enabled.
-    int rgba;
-    if (FcPatternGetInteger(aPattern, FC_RGBA, 0, &rgba) == FcResultMatch) {
-      mSubpixelOrder = rgba;
-    }
-    int filter;
-    if (FcPatternGetInteger(aPattern, FC_LCD_FILTER, 0, &filter) ==
-        FcResultMatch) {
-      mLcdFilter = filter;
-    }
-  }
 
   cairo_font_options_t* fontOptions = cairo_font_options_create();
   cairo_scaled_font_get_font_options(aScaledFont, fontOptions);
@@ -106,19 +115,96 @@
           FcResultMatch) {
         hintstyle = FC_HINT_FULL;
       }
-      mHintStyle = hintstyle;
+      switch (hintstyle) {
+        case FC_HINT_SLIGHT:
+          mHinting = FontHinting::LIGHT;
+          break;
+        case FC_HINT_MEDIUM:
+          mHinting = FontHinting::NORMAL;
+          break;
+        case FC_HINT_FULL:
+          mHinting = FontHinting::FULL;
+          break;
+        case FC_HINT_NONE:
+        default:
+          break;
+      }
     }
   }
   cairo_font_options_destroy(fontOptions);
+
+  FcBool antialias;
+  if (FcPatternGetBool(aPattern, FC_ANTIALIAS, 0, &antialias) ==
+          FcResultMatch &&
+      !antialias) {
+    // If AA is explicitly disabled, leave bitmaps enabled.
+    mFlags |= EMBEDDED_BITMAP;
+  } else {
+    mAntialias = AntialiasMode::GRAY;
+
+    // Otherwise, if AA is enabled, disable embedded bitmaps unless explicitly
+    // enabled.
+    FcBool bitmap;
+    if (mHinting != FontHinting::NONE &&
+        FcPatternGetBool(aPattern, FC_EMBEDDED_BITMAP, 0, &bitmap) ==
+            FcResultMatch &&
+        bitmap) {
+      mFlags |= EMBEDDED_BITMAP;
+    }
+
+    // Only record subpixel order and lcd filtering if antialiasing is enabled.
+    int rgba;
+    if (mFlags & HINT_METRICS &&
+        FcPatternGetInteger(aPattern, FC_RGBA, 0, &rgba) == FcResultMatch) {
+      switch (rgba) {
+        case FC_RGBA_RGB:
+        case FC_RGBA_BGR:
+        case FC_RGBA_VRGB:
+        case FC_RGBA_VBGR:
+          mAntialias = AntialiasMode::SUBPIXEL;
+          if (rgba == FC_RGBA_VRGB || rgba == FC_RGBA_VBGR) {
+            mFlags |= LCD_VERTICAL;
+          }
+          if (rgba == FC_RGBA_BGR || rgba == FC_RGBA_VBGR) {
+            mFlags |= SUBPIXEL_BGR;
+          }
+          break;
+        case FC_RGBA_NONE:
+        case FC_RGBA_UNKNOWN:
+        default:
+          break;
+      }
+    }
+
+    int filter;
+    if (mAntialias == AntialiasMode::SUBPIXEL &&
+        FcPatternGetInteger(aPattern, FC_LCD_FILTER, 0, &filter) ==
+        FcResultMatch) {
+      switch (filter) {
+        case FC_LCD_NONE:
+          mLcdFilter = FT_LCD_FILTER_NONE;
+          break;
+        case FC_LCD_DEFAULT:
+          mLcdFilter = FT_LCD_FILTER_DEFAULT;
+          break;
+        case FC_LCD_LIGHT:
+          mLcdFilter = FT_LCD_FILTER_LIGHT;
+          break;
+        case FC_LCD_LEGACY:
+        default:
+          break;
+      }
+    }
+  }
 }
 
 ScaledFontFontconfig::InstanceData::InstanceData(
     const wr::FontInstanceOptions* aOptions,
     const wr::FontInstancePlatformOptions* aPlatformOptions)
     : mFlags(HINT_METRICS),
-      mHintStyle(FC_HINT_FULL),
-      mSubpixelOrder(FC_RGBA_UNKNOWN),
-      mLcdFilter(FC_LCD_LEGACY) {
+      mAntialias(AntialiasMode::NONE),
+      mHinting(FontHinting::FULL),
+      mLcdFilter(FT_LCD_FILTER_LEGACY) {
   if (aOptions) {
     if (aOptions->flags & wr::FontInstanceFlags_FORCE_AUTOHINT) {
       mFlags |= AUTOHINT;
@@ -129,47 +215,41 @@
     if (aOptions->flags & wr::FontInstanceFlags_SYNTHETIC_BOLD) {
       mFlags |= EMBOLDEN;
     }
-    if (aOptions->flags & wr::FontInstanceFlags_VERTICAL_LAYOUT) {
-      mFlags |= VERTICAL_LAYOUT;
-    }
-    if (aOptions->render_mode != wr::FontRenderMode::Mono) {
-      mFlags |= ANTIALIAS;
-      if (aOptions->render_mode == wr::FontRenderMode::Subpixel) {
-        if (aOptions->flags & wr::FontInstanceFlags_SUBPIXEL_BGR) {
-          mSubpixelOrder = aOptions->flags & wr::FontInstanceFlags_LCD_VERTICAL
-                               ? FC_RGBA_VBGR
-                               : FC_RGBA_BGR;
-        } else {
-          mSubpixelOrder = aOptions->flags & wr::FontInstanceFlags_LCD_VERTICAL
-                               ? FC_RGBA_VRGB
-                               : FC_RGBA_RGB;
-        }
+    if (aOptions->render_mode == wr::FontRenderMode::Subpixel) {
+      mAntialias = AntialiasMode::SUBPIXEL;
+      if (aOptions->flags & wr::FontInstanceFlags_SUBPIXEL_BGR) {
+        mFlags |= SUBPIXEL_BGR;
+      }
+      if (aOptions->flags & wr::FontInstanceFlags_LCD_VERTICAL) {
+        mFlags |= LCD_VERTICAL;
       }
+    } else if (aOptions->render_mode != wr::FontRenderMode::Mono) {
+      mAntialias = AntialiasMode::GRAY;
     }
   }
   if (aPlatformOptions) {
     switch (aPlatformOptions->hinting) {
       case wr::FontHinting::None:
-        mHintStyle = FC_HINT_NONE;
+        mHinting = FontHinting::NONE;
         break;
       case wr::FontHinting::Light:
-        mHintStyle = FC_HINT_SLIGHT;
+        mHinting = FontHinting::LIGHT;
         break;
       case wr::FontHinting::Normal:
-        mHintStyle = FC_HINT_MEDIUM;
+        mHinting = FontHinting::NORMAL;
         break;
       default:
         break;
     }
     switch (aPlatformOptions->lcd_filter) {
       case wr::FontLCDFilter::None:
-        mLcdFilter = FC_LCD_NONE;
+        mLcdFilter = FT_LCD_FILTER_NONE;
         break;
       case wr::FontLCDFilter::Default:
-        mLcdFilter = FC_LCD_DEFAULT;
+        mLcdFilter = FT_LCD_FILTER_DEFAULT;
         break;
       case wr::FontLCDFilter::Light:
-        mLcdFilter = FC_LCD_LIGHT;
+        mLcdFilter = FT_LCD_FILTER_LIGHT;
         break;
       default:
         break;
@@ -177,120 +257,96 @@
   }
 }
 
-void ScaledFontFontconfig::InstanceData::SetupPattern(
-    FcPattern* aPattern) const {
-  if (mFlags & AUTOHINT) {
-    FcPatternAddBool(aPattern, FC_AUTOHINT, FcTrue);
-  }
-  if (mFlags & EMBEDDED_BITMAP) {
-    FcPatternAddBool(aPattern, FC_EMBEDDED_BITMAP, FcTrue);
-  }
-  if (mFlags & EMBOLDEN) {
-    FcPatternAddBool(aPattern, FC_EMBOLDEN, FcTrue);
-  }
-  if (mFlags & VERTICAL_LAYOUT) {
-    FcPatternAddBool(aPattern, FC_VERTICAL_LAYOUT, FcTrue);
-  }
-
-  if (mFlags & ANTIALIAS) {
-    FcPatternAddBool(aPattern, FC_ANTIALIAS, FcTrue);
-    if (mSubpixelOrder != FC_RGBA_UNKNOWN) {
-      FcPatternAddInteger(aPattern, FC_RGBA, mSubpixelOrder);
-    }
-    if (mLcdFilter != FC_LCD_LEGACY) {
-      FcPatternAddInteger(aPattern, FC_LCD_FILTER, mLcdFilter);
-    }
-  } else {
-    FcPatternAddBool(aPattern, FC_ANTIALIAS, FcFalse);
-  }
-
-  if (mHintStyle) {
-    FcPatternAddBool(aPattern, FC_HINTING, FcTrue);
-    FcPatternAddInteger(aPattern, FC_HINT_STYLE, mHintStyle);
-  } else {
-    FcPatternAddBool(aPattern, FC_HINTING, FcFalse);
-  }
-}
-
 void ScaledFontFontconfig::InstanceData::SetupFontOptions(
-    cairo_font_options_t* aFontOptions) const {
-  // Try to build a sane initial set of Cairo font options based on the
-  // Fontconfig pattern.
-  if (mFlags & HINT_METRICS) {
-    // For regular (non-printer) fonts, enable hint metrics as well as hinting
-    // and (possibly subpixel) antialiasing.
-    cairo_font_options_set_hint_metrics(aFontOptions, CAIRO_HINT_METRICS_ON);
-
-    cairo_hint_style_t hinting;
-    switch (mHintStyle) {
-      case FC_HINT_NONE:
-        hinting = CAIRO_HINT_STYLE_NONE;
-        break;
-      case FC_HINT_SLIGHT:
-        hinting = CAIRO_HINT_STYLE_SLIGHT;
-        break;
-      case FC_HINT_MEDIUM:
-      default:
-        hinting = CAIRO_HINT_STYLE_MEDIUM;
-        break;
-      case FC_HINT_FULL:
-        hinting = CAIRO_HINT_STYLE_FULL;
-        break;
-    }
-    cairo_font_options_set_hint_style(aFontOptions, hinting);
+    cairo_font_options_t* aFontOptions, int* aOutLoadFlags,
+    unsigned int* aOutSynthFlags) const {
+  // For regular (non-printer) fonts, enable hint metrics as well as hinting
+  // and (possibly subpixel) antialiasing.
+  cairo_font_options_set_hint_metrics(aFontOptions, mFlags & HINT_METRICS ? CAIRO_HINT_METRICS_ON : CAIRO_HINT_METRICS_OFF);
+
+  cairo_hint_style_t hinting;
+  switch (mHinting) {
+    case FontHinting::NONE:
+      hinting = CAIRO_HINT_STYLE_NONE;
+      break;
+    case FontHinting::LIGHT:
+      hinting = CAIRO_HINT_STYLE_SLIGHT;
+      break;
+    case FontHinting::NORMAL:
+      hinting = CAIRO_HINT_STYLE_MEDIUM;
+      break;
+    case FontHinting::FULL:
+      hinting = CAIRO_HINT_STYLE_FULL;
+      break;
+  }
+  cairo_font_options_set_hint_style(aFontOptions, hinting);
 
-    if (mFlags & ANTIALIAS) {
-      cairo_subpixel_order_t subpixel = CAIRO_SUBPIXEL_ORDER_DEFAULT;
-      switch (mSubpixelOrder) {
-        case FC_RGBA_RGB:
-          subpixel = CAIRO_SUBPIXEL_ORDER_RGB;
-          break;
-        case FC_RGBA_BGR:
-          subpixel = CAIRO_SUBPIXEL_ORDER_BGR;
+  switch (mAntialias) {
+    case AntialiasMode::NONE:
+      cairo_font_options_set_antialias(aFontOptions, CAIRO_ANTIALIAS_NONE);
+      break;
+    case AntialiasMode::GRAY:
+    default:
+      cairo_font_options_set_antialias(aFontOptions, CAIRO_ANTIALIAS_GRAY);
+      break;
+    case AntialiasMode::SUBPIXEL: {
+      cairo_font_options_set_antialias(aFontOptions,
+                                       CAIRO_ANTIALIAS_SUBPIXEL);
+      cairo_font_options_set_subpixel_order(
+          aFontOptions,
+          mFlags & SUBPIXEL_BGR
+              ? (mFlags & LCD_VERTICAL ? CAIRO_SUBPIXEL_ORDER_VBGR
+                                       : CAIRO_SUBPIXEL_ORDER_BGR)
+              : (mFlags & LCD_VERTICAL ? CAIRO_SUBPIXEL_ORDER_VRGB
+                                       : CAIRO_SUBPIXEL_ORDER_RGB));
+      cairo_lcd_filter_t lcdFilter = CAIRO_LCD_FILTER_DEFAULT;
+      switch (mLcdFilter) {
+      case FT_LCD_FILTER_NONE:
+          lcdFilter = CAIRO_LCD_FILTER_NONE;
           break;
-        case FC_RGBA_VRGB:
-          subpixel = CAIRO_SUBPIXEL_ORDER_VRGB;
+      case FT_LCD_FILTER_DEFAULT:
+          lcdFilter = CAIRO_LCD_FILTER_FIR5;
           break;
-        case FC_RGBA_VBGR:
-          subpixel = CAIRO_SUBPIXEL_ORDER_VBGR;
+      case FT_LCD_FILTER_LIGHT:
+          lcdFilter = CAIRO_LCD_FILTER_FIR3;
           break;
-        default:
+      case FT_LCD_FILTER_LEGACY:
+          lcdFilter = CAIRO_LCD_FILTER_INTRA_PIXEL;
           break;
       }
-      if (subpixel != CAIRO_SUBPIXEL_ORDER_DEFAULT) {
-        cairo_font_options_set_antialias(aFontOptions,
-                                         CAIRO_ANTIALIAS_SUBPIXEL);
-        cairo_font_options_set_subpixel_order(aFontOptions, subpixel);
-      } else {
-        cairo_font_options_set_antialias(aFontOptions, CAIRO_ANTIALIAS_GRAY);
-      }
-    } else {
-      cairo_font_options_set_antialias(aFontOptions, CAIRO_ANTIALIAS_NONE);
+      cairo_font_options_set_lcd_filter(aFontOptions, lcdFilter);
+      break;
     }
-  } else {
-    // For printer fonts, disable hint metrics and hinting. Don't allow subpixel
-    // antialiasing.
-    cairo_font_options_set_hint_metrics(aFontOptions, CAIRO_HINT_METRICS_OFF);
-    cairo_font_options_set_hint_style(aFontOptions, CAIRO_HINT_STYLE_NONE);
-    cairo_font_options_set_antialias(aFontOptions, mFlags & ANTIALIAS
-                                                       ? CAIRO_ANTIALIAS_GRAY
-                                                       : CAIRO_ANTIALIAS_NONE);
   }
+
+  // Try to build a sane initial set of Cairo font options based on the
+  // Fontconfig pattern.
+  int loadFlags = FT_LOAD_DEFAULT;
+  unsigned int synthFlags = 0;
+
+  if (!(mFlags & EMBEDDED_BITMAP)) {
+    loadFlags |= FT_LOAD_NO_BITMAP;
+  }
+  if (mFlags & AUTOHINT) {
+    loadFlags |= FT_LOAD_FORCE_AUTOHINT;
+  }
+  if (mFlags & EMBOLDEN) {
+    synthFlags |= CAIRO_FT_SYNTHESIZE_BOLD;
+  }
+
+  *aOutLoadFlags = loadFlags;
+  *aOutSynthFlags = synthFlags;
 }
 
 bool ScaledFontFontconfig::GetFontInstanceData(FontInstanceDataOutput aCb,
                                                void* aBaton) {
-  InstanceData instance(GetCairoScaledFont(), mPattern);
-
   std::vector<FontVariation> variations;
   if (HasVariationSettings()) {
-    FT_Face face = nullptr;
-    if (FcPatternGetFTFace(mPattern, FC_FT_FACE, 0, &face) == FcResultMatch) {
-      UnscaledFontFreeType::GetVariationSettingsFromFace(&variations, face);
-    }
+    UnscaledFontFreeType::GetVariationSettingsFromFace(&variations,
+                                                       mFace->GetFace());
   }
 
-  aCb(reinterpret_cast<uint8_t*>(&instance), sizeof(instance),
+  aCb(reinterpret_cast<uint8_t*>(&mInstanceData), sizeof(mInstanceData),
       variations.data(), variations.size(), aBaton);
   return true;
 }
@@ -312,110 +368,64 @@
   platformOptions.lcd_filter = wr::FontLCDFilter::Legacy;
   platformOptions.hinting = wr::FontHinting::Normal;
 
-  FcBool autohint;
-  if (FcPatternGetBool(mPattern, FC_AUTOHINT, 0, &autohint) == FcResultMatch &&
-      autohint) {
+  if (mInstanceData.mFlags & InstanceData::AUTOHINT) {
     options.flags |= wr::FontInstanceFlags_FORCE_AUTOHINT;
   }
-  FcBool embolden;
-  if (FcPatternGetBool(mPattern, FC_EMBOLDEN, 0, &embolden) == FcResultMatch &&
-      embolden) {
+  if (mInstanceData.mFlags & InstanceData::EMBOLDEN) {
     options.flags |= wr::FontInstanceFlags_SYNTHETIC_BOLD;
   }
-  FcBool vertical;
-  if (FcPatternGetBool(mPattern, FC_VERTICAL_LAYOUT, 0, &vertical) ==
-          FcResultMatch &&
-      vertical) {
-    options.flags |= wr::FontInstanceFlags_VERTICAL_LAYOUT;
+  if (mInstanceData.mFlags & InstanceData::EMBEDDED_BITMAP) {
+    options.flags |= wr::FontInstanceFlags_EMBEDDED_BITMAPS;
   }
-
-  FcBool antialias;
-  if (FcPatternGetBool(mPattern, FC_ANTIALIAS, 0, &antialias) !=
-          FcResultMatch ||
-      antialias) {
-    int rgba;
-    if (FcPatternGetInteger(mPattern, FC_RGBA, 0, &rgba) == FcResultMatch) {
-      switch (rgba) {
-        case FC_RGBA_RGB:
-        case FC_RGBA_BGR:
-        case FC_RGBA_VRGB:
-        case FC_RGBA_VBGR:
-          options.render_mode = wr::FontRenderMode::Subpixel;
-          if (rgba == FC_RGBA_VRGB || rgba == FC_RGBA_VBGR) {
-            options.flags |= wr::FontInstanceFlags_LCD_VERTICAL;
-          }
-          platformOptions.hinting = wr::FontHinting::LCD;
-          if (rgba == FC_RGBA_BGR || rgba == FC_RGBA_VBGR) {
-            options.flags |= wr::FontInstanceFlags_SUBPIXEL_BGR;
-          }
-          break;
-        case FC_RGBA_NONE:
-        case FC_RGBA_UNKNOWN:
-        default:
-          break;
+  if (mInstanceData.mAntialias != AntialiasMode::NONE) {
+    if (mInstanceData.mAntialias == AntialiasMode::SUBPIXEL) {
+      options.render_mode = wr::FontRenderMode::Subpixel;
+      platformOptions.hinting = wr::FontHinting::LCD;
+      if (mInstanceData.mFlags & InstanceData::LCD_VERTICAL) {
+        options.flags |= wr::FontInstanceFlags_LCD_VERTICAL;
       }
-    }
-
-    if (options.render_mode == wr::FontRenderMode::Subpixel) {
-      int filter;
-      if (FcPatternGetInteger(mPattern, FC_LCD_FILTER, 0, &filter) ==
-          FcResultMatch) {
-        switch (filter) {
-          case FC_LCD_NONE:
-            platformOptions.lcd_filter = wr::FontLCDFilter::None;
-            break;
-          case FC_LCD_DEFAULT:
-            platformOptions.lcd_filter = wr::FontLCDFilter::Default;
-            break;
-          case FC_LCD_LIGHT:
-            platformOptions.lcd_filter = wr::FontLCDFilter::Light;
-            break;
-          case FC_LCD_LEGACY:
-          default:
-            break;
-        }
+      if (mInstanceData.mFlags & InstanceData::SUBPIXEL_BGR) {
+        options.flags |= wr::FontInstanceFlags_SUBPIXEL_BGR;
       }
     }
 
-    // Match cairo-ft's handling of embeddedbitmap:
-    // If AA is explicitly disabled, leave bitmaps enabled.
-    // Otherwise, disable embedded bitmaps unless explicitly enabled.
-    FcBool bitmap;
-    if (FcPatternGetBool(mPattern, FC_EMBEDDED_BITMAP, 0, &bitmap) ==
-            FcResultMatch &&
-        bitmap) {
-      options.flags |= wr::FontInstanceFlags_EMBEDDED_BITMAPS;
-    }
-  } else {
-    options.render_mode = wr::FontRenderMode::Mono;
-    platformOptions.hinting = wr::FontHinting::Mono;
-    options.flags |= wr::FontInstanceFlags_EMBEDDED_BITMAPS;
-  }
-
-  FcBool hinting;
-  int hintstyle;
-  if (FcPatternGetBool(mPattern, FC_HINTING, 0, &hinting) != FcResultMatch ||
-      hinting) {
-    if (FcPatternGetInteger(mPattern, FC_HINT_STYLE, 0, &hintstyle) !=
-        FcResultMatch) {
-      hintstyle = FC_HINT_FULL;
+    switch (mInstanceData.mLcdFilter) {
+      case FT_LCD_FILTER_NONE:
+        platformOptions.lcd_filter = wr::FontLCDFilter::None;
+        break;
+      case FT_LCD_FILTER_DEFAULT:
+        platformOptions.lcd_filter = wr::FontLCDFilter::Default;
+        break;
+      case FT_LCD_FILTER_LIGHT:
+        platformOptions.lcd_filter = wr::FontLCDFilter::Light;
+        break;
+      case FT_LCD_FILTER_LEGACY:
+      default:
+        break;
     }
-  } else {
-    hintstyle = FC_HINT_NONE;
-  }
 
-  if (hintstyle == FC_HINT_NONE) {
-    platformOptions.hinting = wr::FontHinting::None;
-  } else if (options.render_mode != wr::FontRenderMode::Mono) {
-    switch (hintstyle) {
-      case FC_HINT_SLIGHT:
+    switch (mInstanceData.mHinting) {
+      case FontHinting::NONE:
+        platformOptions.hinting = wr::FontHinting::None;
+        break;
+      case FontHinting::LIGHT:
         platformOptions.hinting = wr::FontHinting::Light;
         break;
-      case FC_HINT_MEDIUM:
+      case FontHinting::NORMAL:
         platformOptions.hinting = wr::FontHinting::Normal;
         break;
-      case FC_HINT_FULL:
+      case FontHinting::FULL:
+        break;
+    }
+  } else {
+    options.render_mode = wr::FontRenderMode::Mono;
+
+    switch (mInstanceData.mHinting) {
+      case FontHinting::NONE:
+        platformOptions.hinting = wr::FontHinting::None;
+        break;
       default:
+        platformOptions.hinting = wr::FontHinting::Mono;
         break;
     }
   }
@@ -424,27 +434,13 @@
   *aOutPlatformOptions = Some(platformOptions);
 
   if (HasVariationSettings()) {
-    FT_Face face = nullptr;
-    if (FcPatternGetFTFace(mPattern, FC_FT_FACE, 0, &face) == FcResultMatch) {
-      UnscaledFontFreeType::GetVariationSettingsFromFace(aOutVariations, face);
-    }
+    UnscaledFontFreeType::GetVariationSettingsFromFace(aOutVariations,
+                                                       mFace->GetFace());
   }
 
   return true;
 }
 
-static cairo_user_data_key_t sNativeFontResourceKey;
-
-static void ReleaseNativeFontResource(void* aData) {
-  static_cast<NativeFontResource*>(aData)->Release();
-}
-
-static cairo_user_data_key_t sFaceKey;
-
-static void ReleaseFace(void* aData) {
-  Factory::ReleaseFTFace(static_cast<FT_Face>(aData));
-}
-
 already_AddRefed<ScaledFont> UnscaledFontFontconfig::CreateScaledFont(
     Float aSize, const uint8_t* aInstanceData, uint32_t aInstanceDataLength,
     const FontVariation* aVariations, uint32_t aNumVariations) {
@@ -456,86 +452,38 @@
       *reinterpret_cast<const ScaledFontFontconfig::InstanceData*>(
           aInstanceData);
 
-  FcPattern* pattern = FcPatternCreate();
-  if (!pattern) {
-    gfxWarning() << "Failed initializing Fontconfig pattern for scaled font";
+  RefPtr<SharedFTFace> face(InitFace());
+  if (!face) {
+    gfxWarning() << "Attempted to deserialize Fontconfig scaled font without "
+                    "FreeType face";
     return nullptr;
   }
-  FT_Face face = GetFace();
-  NativeFontResourceFreeType* nfr =
-      static_cast<NativeFontResourceFreeType*>(mNativeFontResource.get());
-  FT_Face varFace = nullptr;
-  if (face) {
-    if (nfr && aNumVariations > 0) {
-      varFace = nfr->CloneFace();
-      if (!varFace) {
-        gfxWarning() << "Failed cloning face for variations";
-      }
+
+  if (aNumVariations > 0 && face->GetData()) {
+    if (RefPtr<SharedFTFace> varFace = face->GetData()->CloneFace()) {
+      face = varFace;
     }
-    FcPatternAddFTFace(pattern, FC_FT_FACE, varFace ? varFace : face);
-  } else {
-    FcPatternAddString(pattern, FC_FILE,
-                       reinterpret_cast<const FcChar8*>(GetFile()));
-    FcPatternAddInteger(pattern, FC_INDEX, GetIndex());
   }
-  FcPatternAddDouble(pattern, FC_PIXEL_SIZE, aSize);
-  instanceData.SetupPattern(pattern);
 
-  StackArray<FT_Fixed, 32> coords(aNumVariations);
-  for (uint32_t i = 0; i < aNumVariations; i++) {
-    coords[i] = std::round(aVariations[i].mValue * 65536.0);
-  }
+  cairo_font_options_t* fontOptions = cairo_font_options_create();
+  int loadFlags;
+  unsigned int synthFlags;
+  instanceData.SetupFontOptions(fontOptions, &loadFlags, &synthFlags);
 
-  cairo_font_face_t* font = cairo_ft_font_face_create_for_pattern(
-      pattern, coords.data(), aNumVariations);
+  cairo_font_face_t* font = cairo_ft_font_face_create_for_ft_face(
+      face->GetFace(), loadFlags, synthFlags, face.get());
   if (cairo_font_face_status(font) != CAIRO_STATUS_SUCCESS) {
     gfxWarning() << "Failed creating Cairo font face for Fontconfig pattern";
-    FcPatternDestroy(pattern);
-    if (varFace) {
-      Factory::ReleaseFTFace(varFace);
-    }
+    cairo_font_options_destroy(fontOptions);
     return nullptr;
   }
 
-  if (nfr) {
-    // Bug 1362117 - Cairo may keep the font face alive after the owning
-    // NativeFontResource was freed. To prevent this, we must bind the
-    // NativeFontResource to the font face so that it stays alive at least as
-    // long as the font face.
-    nfr->AddRef();
-    cairo_status_t err = CAIRO_STATUS_SUCCESS;
-    bool cleanupFace = false;
-    if (varFace) {
-      err =
-          cairo_font_face_set_user_data(font, &sFaceKey, varFace, ReleaseFace);
-    }
-    if (err != CAIRO_STATUS_SUCCESS) {
-      cleanupFace = true;
-    } else {
-      err = cairo_font_face_set_user_data(font, &sNativeFontResourceKey, nfr,
-                                          ReleaseNativeFontResource);
-    }
-    if (err != CAIRO_STATUS_SUCCESS) {
-      gfxWarning() << "Failed binding NativeFontResource to Cairo font face";
-      if (varFace && cleanupFace) {
-        Factory::ReleaseFTFace(varFace);
-      }
-      nfr->Release();
-      cairo_font_face_destroy(font);
-      FcPatternDestroy(pattern);
-      return nullptr;
-    }
-  }
-
   cairo_matrix_t sizeMatrix;
   cairo_matrix_init(&sizeMatrix, aSize, 0, 0, aSize, 0, 0);
 
   cairo_matrix_t identityMatrix;
   cairo_matrix_init_identity(&identityMatrix);
 
-  cairo_font_options_t* fontOptions = cairo_font_options_create();
-  instanceData.SetupFontOptions(fontOptions);
-
   cairo_scaled_font_t* cairoScaledFont =
       cairo_scaled_font_create(font, &sizeMatrix, &identityMatrix, fontOptions);
 
@@ -544,21 +492,18 @@
 
   if (cairo_scaled_font_status(cairoScaledFont) != CAIRO_STATUS_SUCCESS) {
     gfxWarning() << "Failed creating Cairo scaled font for font face";
-    FcPatternDestroy(pattern);
     return nullptr;
   }
 
-  RefPtr<ScaledFontFontconfig> scaledFont =
-      new ScaledFontFontconfig(cairoScaledFont, pattern, this, aSize);
+  // Only apply variations if we have an explicitly cloned face.
+  if (aNumVariations > 0 && face != GetFace()) {
+    ApplyVariationsToFace(aVariations, aNumVariations, face->GetFace());
+  }
+
+  RefPtr<ScaledFontFontconfig> scaledFont = new ScaledFontFontconfig(
+      cairoScaledFont, std::move(face), instanceData, this, aSize);
 
   cairo_scaled_font_destroy(cairoScaledFont);
-  FcPatternDestroy(pattern);
-
-  // Only apply variations if we have an explicitly cloned face. Otherwise,
-  // if the pattern holds the pathname, Cairo will handle setting of variations.
-  if (varFace) {
-    ApplyVariationsToFace(aVariations, aNumVariations, varFace);
-  }
 
   return scaledFont.forget();
 }
@@ -574,11 +519,10 @@
 
 bool ScaledFontFontconfig::HasVariationSettings() {
   // Check if the FT face has been cloned.
-  FT_Face face = nullptr;
-  return FcPatternGetFTFace(mPattern, FC_FT_FACE, 0, &face) == FcResultMatch &&
-         face && face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS &&
-         face != static_cast<UnscaledFontFontconfig*>(mUnscaledFont.get())
-                     ->GetFace();
+  return mFace &&
+         mFace->GetFace()->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS &&
+         mFace != static_cast<UnscaledFontFontconfig*>(mUnscaledFont.get())
+                      ->GetFace();
 }
 
 already_AddRefed<UnscaledFont> UnscaledFontFontconfig::CreateFromFontDescriptor(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontFontconfig.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontFontconfig.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontFontconfig.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontFontconfig.h	2019-09-15 11:33:10.000000000 +0000
@@ -20,16 +20,19 @@
 class ScaledFontFontconfig : public ScaledFontBase {
  public:
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(ScaledFontFontconfig, override)
-  ScaledFontFontconfig(cairo_scaled_font_t* aScaledFont, FcPattern* aPattern,
+  ScaledFontFontconfig(cairo_scaled_font_t* aScaledFont,
+                       RefPtr<SharedFTFace>&& aFace, FcPattern* aPattern,
                        const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize);
-  ~ScaledFontFontconfig();
 
   FontType GetType() const override { return FontType::FONTCONFIG; }
 
 #ifdef USE_SKIA
   SkTypeface* CreateSkTypeface() override;
+  void SetupSkFontDrawOptions(SkFont& aFont) override;
 #endif
 
+  AntialiasMode GetDefaultAAMode() override;
+
   bool CanSerialize() override { return true; }
 
   bool GetFontInstanceData(FontInstanceDataOutput aCb, void* aBaton) override;
@@ -47,28 +50,35 @@
 
   struct InstanceData {
     enum {
-      ANTIALIAS = 1 << 0,
-      AUTOHINT = 1 << 1,
-      EMBEDDED_BITMAP = 1 << 2,
-      EMBOLDEN = 1 << 3,
-      VERTICAL_LAYOUT = 1 << 4,
-      HINT_METRICS = 1 << 5
+      AUTOHINT = 1 << 0,
+      EMBEDDED_BITMAP = 1 << 1,
+      EMBOLDEN = 1 << 2,
+      HINT_METRICS = 1 << 3,
+      LCD_VERTICAL = 1 << 4,
+      SUBPIXEL_BGR = 1 << 5,
     };
 
     InstanceData(cairo_scaled_font_t* aScaledFont, FcPattern* aPattern);
     InstanceData(const wr::FontInstanceOptions* aOptions,
                  const wr::FontInstancePlatformOptions* aPlatformOptions);
 
-    void SetupPattern(FcPattern* aPattern) const;
-    void SetupFontOptions(cairo_font_options_t* aFontOptions) const;
+    void SetupFontOptions(cairo_font_options_t* aFontOptions,
+                          int* aOutLoadFlags,
+                          unsigned int* aOutSynthFlags) const;
 
     uint8_t mFlags;
-    uint8_t mHintStyle;
-    uint8_t mSubpixelOrder;
+    AntialiasMode mAntialias;
+    FontHinting mHinting;
     uint8_t mLcdFilter;
   };
 
-  FcPattern* mPattern;
+  ScaledFontFontconfig(cairo_scaled_font_t* aScaledFont,
+                       RefPtr<SharedFTFace>&& aFace,
+                       const InstanceData& aInstanceData,
+                       const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize);
+
+  RefPtr<SharedFTFace> mFace;
+  InstanceData mInstanceData;
 };
 
 }  // namespace gfx
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontFreeType.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontFreeType.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontFreeType.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontFreeType.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -8,7 +8,6 @@
 #include "UnscaledFontFreeType.h"
 #include "NativeFontResourceFreeType.h"
 #include "Logging.h"
-#include "StackArray.h"
 #include "mozilla/webrender/WebRenderTypes.h"
 
 #ifdef USE_SKIA
@@ -25,15 +24,29 @@
 // This is mainly because FT_Face is not good for sharing between libraries,
 // which is a requirement when we consider runtime switchable backends and so on
 ScaledFontFreeType::ScaledFontFreeType(
-    cairo_scaled_font_t* aScaledFont, FT_Face aFace,
-    const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize)
-    : ScaledFontBase(aUnscaledFont, aSize), mFace(aFace) {
+    cairo_scaled_font_t* aScaledFont, RefPtr<SharedFTFace>&& aFace,
+    const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize,
+    bool aApplySyntheticBold)
+    : ScaledFontBase(aUnscaledFont, aSize),
+      mFace(std::move(aFace)),
+      mApplySyntheticBold(aApplySyntheticBold) {
   SetCairoScaledFont(aScaledFont);
 }
 
 #ifdef USE_SKIA
 SkTypeface* ScaledFontFreeType::CreateSkTypeface() {
-  return SkCreateTypefaceFromCairoFTFont(mScaledFont, mFace);
+  return SkCreateTypefaceFromCairoFTFont(mFace->GetFace(), mFace.get());
+}
+
+void ScaledFontFreeType::SetupSkFontDrawOptions(SkFont& aFont) {
+  // SkFontHost_cairo does not support subpixel text positioning
+  aFont.setSubpixel(false);
+
+  if (mApplySyntheticBold) {
+    aFont.setEmbolden(true);
+  }
+
+  aFont.setEmbeddedBitmaps(true);
 }
 #endif
 
@@ -41,10 +54,13 @@
                                              void* aBaton) {
   std::vector<FontVariation> variations;
   if (HasVariationSettings()) {
-    UnscaledFontFreeType::GetVariationSettingsFromFace(&variations, mFace);
+    UnscaledFontFreeType::GetVariationSettingsFromFace(&variations,
+                                                       mFace->GetFace());
   }
 
-  aCb(nullptr, 0, variations.data(), variations.size(), aBaton);
+  InstanceData instance(this);
+  aCb(reinterpret_cast<uint8_t*>(&instance), sizeof(instance),
+      variations.data(), variations.size(), aBaton);
   return true;
 }
 
@@ -62,6 +78,10 @@
   options.synthetic_italics =
       wr::DegreesToSyntheticItalics(GetSyntheticObliqueAngle());
 
+  if (mApplySyntheticBold) {
+    options.flags |= wr::FontInstanceFlags_SYNTHETIC_BOLD;
+  }
+
   wr::FontInstancePlatformOptions platformOptions;
   platformOptions.lcd_filter = wr::FontLCDFilter::None;
   platformOptions.hinting = wr::FontHinting::None;
@@ -70,113 +90,59 @@
   *aOutPlatformOptions = Some(platformOptions);
 
   if (HasVariationSettings()) {
-    UnscaledFontFreeType::GetVariationSettingsFromFace(aOutVariations, mFace);
+    UnscaledFontFreeType::GetVariationSettingsFromFace(aOutVariations,
+                                                       mFace->GetFace());
   }
 
   return true;
 }
 
-FT_Face UnscaledFontFreeType::InitFace() {
-  if (mFace) {
-    return mFace;
-  }
-  if (mFile.empty()) {
-    return nullptr;
-  }
-  FT_Face face = Factory::NewFTFace(nullptr, mFile.c_str(), mIndex);
-  if (!face) {
-    gfxWarning() << "Failed initializing FreeType face from filename";
-    return nullptr;
+ScaledFontFreeType::InstanceData::InstanceData(
+    const wr::FontInstanceOptions* aOptions,
+    const wr::FontInstancePlatformOptions* aPlatformOptions)
+    : mApplySyntheticBold(false) {
+  if (aOptions) {
+    if (aOptions->flags & wr::FontInstanceFlags_SYNTHETIC_BOLD) {
+      mApplySyntheticBold = true;
+    }
   }
-  mOwnsFace = true;
-  mFace = face;
-  return mFace;
-}
-
-static cairo_user_data_key_t sNativeFontResourceKey;
-
-static void ReleaseNativeFontResource(void* aData) {
-  static_cast<NativeFontResource*>(aData)->Release();
-}
-
-static cairo_user_data_key_t sFaceKey;
-
-static void ReleaseFace(void* aData) {
-  Factory::ReleaseFTFace(static_cast<FT_Face>(aData));
 }
 
 already_AddRefed<ScaledFont> UnscaledFontFreeType::CreateScaledFont(
     Float aGlyphSize, const uint8_t* aInstanceData,
     uint32_t aInstanceDataLength, const FontVariation* aVariations,
     uint32_t aNumVariations) {
-  FT_Face face = InitFace();
+  if (aInstanceDataLength < sizeof(ScaledFontFreeType::InstanceData)) {
+    gfxWarning() << "FreeType scaled font instance data is truncated.";
+    return nullptr;
+  }
+  const ScaledFontFreeType::InstanceData& instanceData =
+      *reinterpret_cast<const ScaledFontFreeType::InstanceData*>(aInstanceData);
+
+  RefPtr<SharedFTFace> face(InitFace());
   if (!face) {
     gfxWarning() << "Attempted to deserialize FreeType scaled font without "
                     "FreeType face";
     return nullptr;
   }
 
-  NativeFontResourceFreeType* nfr =
-      static_cast<NativeFontResourceFreeType*>(mNativeFontResource.get());
-  FT_Face varFace = nullptr;
-  if (nfr && aNumVariations > 0) {
-    varFace = nfr->CloneFace();
-    if (varFace) {
+  if (aNumVariations > 0 && face->GetData()) {
+    if (RefPtr<SharedFTFace> varFace = face->GetData()->CloneFace()) {
       face = varFace;
-    } else {
-      gfxWarning() << "Failed cloning face for variations";
     }
   }
 
-  StackArray<FT_Fixed, 32> coords(aNumVariations);
-  for (uint32_t i = 0; i < aNumVariations; i++) {
-    coords[i] = std::round(aVariations[i].mValue * 65536.0);
-  }
-
   int flags = FT_LOAD_NO_AUTOHINT | FT_LOAD_NO_HINTING;
-  if (face->face_flags & FT_FACE_FLAG_TRICKY) {
+  if (face->GetFace()->face_flags & FT_FACE_FLAG_TRICKY) {
     flags &= ~FT_LOAD_NO_AUTOHINT;
   }
   cairo_font_face_t* font = cairo_ft_font_face_create_for_ft_face(
-      face, flags, coords.data(), aNumVariations);
+      face->GetFace(), flags, 0, face.get());
   if (cairo_font_face_status(font) != CAIRO_STATUS_SUCCESS) {
     gfxWarning() << "Failed creating Cairo font face for FreeType face";
-    if (varFace) {
-      Factory::ReleaseFTFace(varFace);
-    }
     return nullptr;
   }
 
-  if (nfr) {
-    // Bug 1362117 - Cairo may keep the font face alive after the owning
-    // NativeFontResource was freed. To prevent this, we must bind the
-    // NativeFontResource to the font face so that it stays alive at least as
-    // long as the font face.
-    nfr->AddRef();
-    cairo_status_t err = CAIRO_STATUS_SUCCESS;
-    bool cleanupFace = false;
-    if (varFace) {
-      err =
-          cairo_font_face_set_user_data(font, &sFaceKey, varFace, ReleaseFace);
-    }
-
-    if (err != CAIRO_STATUS_SUCCESS) {
-      cleanupFace = true;
-    } else {
-      err = cairo_font_face_set_user_data(font, &sNativeFontResourceKey, nfr,
-                                          ReleaseNativeFontResource);
-    }
-    if (err != CAIRO_STATUS_SUCCESS) {
-      gfxWarning() << "Failed binding NativeFontResource to Cairo font face";
-      if (varFace && cleanupFace) {
-        Factory::ReleaseFTFace(varFace);
-      }
-      nfr->Release();
-      cairo_font_face_destroy(font);
-      return nullptr;
-    }
-  }
-
   cairo_matrix_t sizeMatrix;
   cairo_matrix_init(&sizeMatrix, aGlyphSize, 0, 0, aGlyphSize, 0, 0);
 
@@ -198,23 +164,33 @@
     return nullptr;
   }
 
+  // Only apply variations if we have an explicitly cloned face.
+  if (aNumVariations > 0 && face != GetFace()) {
+    ApplyVariationsToFace(aVariations, aNumVariations, face->GetFace());
+  }
+
   RefPtr<ScaledFontFreeType> scaledFont =
-      new ScaledFontFreeType(cairoScaledFont, face, this, aGlyphSize);
+      new ScaledFontFreeType(cairoScaledFont, std::move(face), this, aGlyphSize,
+                             instanceData.mApplySyntheticBold);
 
   cairo_scaled_font_destroy(cairoScaledFont);
 
-  // Only apply variations if we have an explicitly cloned face. Otherwise,
-  // if the pattern holds the pathname, Cairo will handle setting of variations.
-  if (varFace) {
-    ApplyVariationsToFace(aVariations, aNumVariations, varFace);
-  }
-
   return scaledFont.forget();
 }
 
+already_AddRefed<ScaledFont> UnscaledFontFreeType::CreateScaledFontFromWRFont(
+    Float aGlyphSize, const wr::FontInstanceOptions* aOptions,
+    const wr::FontInstancePlatformOptions* aPlatformOptions,
+    const FontVariation* aVariations, uint32_t aNumVariations) {
+  ScaledFontFreeType::InstanceData instanceData(aOptions, aPlatformOptions);
+  return CreateScaledFont(aGlyphSize, reinterpret_cast<uint8_t*>(&instanceData),
+                          sizeof(instanceData), aVariations, aNumVariations);
+}
+
 bool ScaledFontFreeType::HasVariationSettings() {
   // Check if the FT face has been cloned.
-  return mFace && mFace->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS &&
+  return mFace &&
+         mFace->GetFace()->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS &&
          mFace !=
              static_cast<UnscaledFontFreeType*>(mUnscaledFont.get())->GetFace();
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontFreeType.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontFreeType.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontFreeType.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontFreeType.h	2019-09-15 11:33:10.000000000 +0000
@@ -14,19 +14,26 @@
 namespace mozilla {
 namespace gfx {
 
+class UnscaledFontFreeType;
+
 class ScaledFontFreeType : public ScaledFontBase {
  public:
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(ScaledFontFreeType, override)
 
-  ScaledFontFreeType(cairo_scaled_font_t* aScaledFont, FT_Face aFace,
-                     const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize);
+  ScaledFontFreeType(cairo_scaled_font_t* aScaledFont,
+                     RefPtr<SharedFTFace>&& aFace,
+                     const RefPtr<UnscaledFont>& aUnscaledFont, Float aSize,
+                     bool aApplySyntheticBold = false);
 
   FontType GetType() const override { return FontType::FREETYPE; }
 
 #ifdef USE_SKIA
-  virtual SkTypeface* CreateSkTypeface() override;
+  SkTypeface* CreateSkTypeface() override;
+  void SetupSkFontDrawOptions(SkFont& aFont) override;
 #endif
 
+  AntialiasMode GetDefaultAAMode() override { return AntialiasMode::GRAY; }
+
   bool CanSerialize() override { return true; }
 
   bool GetFontInstanceData(FontInstanceDataOutput aCb, void* aBaton) override;
@@ -39,7 +46,21 @@
   bool HasVariationSettings() override;
 
  private:
-  FT_Face mFace;
+  friend UnscaledFontFreeType;
+
+  RefPtr<SharedFTFace> mFace;
+
+  bool mApplySyntheticBold;
+
+  struct InstanceData {
+    explicit InstanceData(ScaledFontFreeType* aScaledFont)
+        : mApplySyntheticBold(aScaledFont->mApplySyntheticBold) {}
+
+    InstanceData(const wr::FontInstanceOptions* aOptions,
+                 const wr::FontInstancePlatformOptions* aPlatformOptions);
+
+    bool mApplySyntheticBold;
+  };
 };
 
 }  // namespace gfx
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontMac.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontMac.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontMac.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontMac.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -174,6 +174,29 @@
     return typeface;
   }
 }
+
+void ScaledFontMac::SetupSkFontDrawOptions(SkFont& aFont) {
+  aFont.setSubpixel(true);
+
+  // Normally, Skia enables LCD FontSmoothing which creates thicker fonts
+  // and also enables subpixel AA. CoreGraphics without font smoothing
+  // explicitly creates thinner fonts and grayscale AA.
+  // CoreGraphics doesn't support a configuration that produces thicker
+  // fonts with grayscale AA as LCD Font Smoothing enables or disables
+  // both. However, Skia supports it by enabling font smoothing (producing
+  // subpixel AA) and converts it to grayscale AA. Since Skia doesn't
+  // support subpixel AA on transparent backgrounds, we still want font
+  // smoothing for the thicker fonts, even if it is grayscale AA.
+  //
+  // With explicit Grayscale AA (from -moz-osx-font-smoothing:grayscale),
+  // we want to have grayscale AA with no smoothing at all. This means
+  // disabling the LCD font smoothing behaviour.
+  // To accomplish this we have to explicitly disable hinting,
+  // and disable LCDRenderText.
+  if (aFont.getEdging() == SkFont::Edging::kAntiAlias && !mUseFontSmoothing) {
+    aFont.setHinting(kNo_SkFontHinting);
+  }
+}
 #endif
 
 // private API here are the public options on OS X
@@ -408,7 +431,10 @@
   if (!GetVariationsForCTFont(mCTFont, &variations)) {
     return false;
   }
-  aCb(nullptr, 0, variations.data(), variations.size(), aBaton);
+
+  InstanceData instance(this);
+  aCb(reinterpret_cast<uint8_t*>(&instance), sizeof(instance),
+      variations.data(), variations.size(), aBaton);
   return true;
 }
 
@@ -434,6 +460,27 @@
   return true;
 }
 
+ScaledFontMac::InstanceData::InstanceData(
+    const wr::FontInstanceOptions* aOptions,
+    const wr::FontInstancePlatformOptions* aPlatformOptions)
+    : mUseFontSmoothing(true), mApplySyntheticBold(false) {
+  if (aOptions) {
+    if (!(aOptions->flags & wr::FontInstanceFlags_FONT_SMOOTHING)) {
+      mUseFontSmoothing = false;
+    }
+    if (aOptions->flags & wr::FontInstanceFlags_SYNTHETIC_BOLD) {
+      mApplySyntheticBold = true;
+    }
+    if (aOptions->bg_color.a != 0) {
+      mFontSmoothingBackgroundColor =
+          Color(aOptions->bg_color.r * (1.0f / 255.0f),
+                aOptions->bg_color.g * (1.0f / 255.0f),
+                aOptions->bg_color.b * (1.0f / 255.0f),
+                aOptions->bg_color.a * (1.0f / 255.0f));
+    }
+  }
+}
+
 static CFDictionaryRef CreateVariationDictionaryOrNull(
     CGFontRef aCGFont, uint32_t aVariationCount,
     const FontVariation* aVariations) {
@@ -555,6 +602,13 @@
     uint32_t aNumVariations)
 
 {
+  if (aInstanceDataLength < sizeof(ScaledFontMac::InstanceData)) {
+    gfxWarning() << "Mac scaled font instance data is truncated.";
+    return nullptr;
+  }
+  const ScaledFontMac::InstanceData& instanceData =
+      *reinterpret_cast<const ScaledFontMac::InstanceData*>(aInstanceData);
+
   CGFontRef fontRef = mFont;
   if (aNumVariations > 0) {
     CGFontRef varFont =
@@ -564,8 +618,10 @@
     }
   }
 
-  RefPtr<ScaledFontMac> scaledFont =
-      new ScaledFontMac(fontRef, this, aGlyphSize, fontRef != mFont);
+  RefPtr<ScaledFontMac> scaledFont = new ScaledFontMac(
+      fontRef, this, aGlyphSize, fontRef != mFont,
+      instanceData.mFontSmoothingBackgroundColor,
+      instanceData.mUseFontSmoothing, instanceData.mApplySyntheticBold);
 
   if (mNeedsCairo && !scaledFont->PopulateCairoScaledFont()) {
     gfxWarning() << "Unable to create cairo scaled Mac font.";
@@ -575,6 +631,15 @@
   return scaledFont.forget();
 }
 
+already_AddRefed<ScaledFont> UnscaledFontMac::CreateScaledFontFromWRFont(
+    Float aGlyphSize, const wr::FontInstanceOptions* aOptions,
+    const wr::FontInstancePlatformOptions* aPlatformOptions,
+    const FontVariation* aVariations, uint32_t aNumVariations) {
+  ScaledFontMac::InstanceData instanceData(aOptions, aPlatformOptions);
+  return CreateScaledFont(aGlyphSize, reinterpret_cast<uint8_t*>(&instanceData),
+                          sizeof(instanceData), aVariations, aNumVariations);
+}
+
 #ifdef USE_CAIRO_SCALED_FONT
 cairo_font_face_t* ScaledFontMac::GetCairoFontFace() {
   MOZ_ASSERT(mFont);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontMac.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontMac.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/ScaledFontMac.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/ScaledFontMac.h	2019-09-15 11:33:10.000000000 +0000
@@ -21,6 +21,8 @@
 namespace mozilla {
 namespace gfx {
 
+class UnscaledFontMac;
+
 class ScaledFontMac : public ScaledFontBase {
  public:
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(ScaledFontMac, override)
@@ -32,6 +34,7 @@
   FontType GetType() const override { return FontType::MAC; }
 #ifdef USE_SKIA
   SkTypeface* CreateSkTypeface() override;
+  void SetupSkFontDrawOptions(SkFont& aFont) override;
 #endif
   already_AddRefed<Path> GetPathForGlyphs(const GlyphBuffer& aBuffer,
                                           const DrawTarget* aTarget) override;
@@ -52,12 +55,29 @@
 
  private:
   friend class DrawTargetSkia;
+  friend class UnscaledFontMac;
+
   CGFontRef mFont;
   CTFontRef mCTFont;  // only created if CTFontDrawGlyphs is available, otherwise null
+
   Color mFontSmoothingBackgroundColor;
   bool mUseFontSmoothing;
   bool mApplySyntheticBold;
 
+  struct InstanceData {
+    explicit InstanceData(ScaledFontMac* aScaledFont)
+        : mFontSmoothingBackgroundColor(aScaledFont->mFontSmoothingBackgroundColor),
+          mUseFontSmoothing(aScaledFont->mUseFontSmoothing),
+          mApplySyntheticBold(aScaledFont->mApplySyntheticBold) {}
+
+    InstanceData(const wr::FontInstanceOptions* aOptions,
+                 const wr::FontInstancePlatformOptions* aPlatformOptions);
+
+    Color mFontSmoothingBackgroundColor;
+    bool mUseFontSmoothing;
+    bool mApplySyntheticBold;
+  };
+
   typedef void(CTFontDrawGlyphsFuncT)(CTFontRef, const CGGlyph[], const CGPoint[], size_t,
                                       CGContextRef);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/Types.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/Types.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/Types.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/Types.h	2019-09-15 11:33:10.000000000 +0000
@@ -304,8 +304,6 @@
 
 enum class NativeFontType : int8_t {
   GDI_LOGFONT,
-  FREETYPE_FACE,
-  FONTCONFIG_PATTERN,
 };
 
 enum class FontStyle : int8_t { NORMAL, ITALIC, BOLD, BOLD_ITALIC };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/UnscaledFontDWrite.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/UnscaledFontDWrite.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/UnscaledFontDWrite.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/UnscaledFontDWrite.h	2019-09-15 11:33:10.000000000 +0000
@@ -19,21 +19,16 @@
 class UnscaledFontDWrite final : public UnscaledFont {
  public:
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(UnscaledFontDWrite, override)
-  UnscaledFontDWrite(
-      const RefPtr<IDWriteFontFace>& aFontFace,
-      const RefPtr<IDWriteFont>& aFont,
-      DWRITE_FONT_SIMULATIONS aSimulations = DWRITE_FONT_SIMULATIONS_NONE,
-      bool aNeedsCairo = false)
+  UnscaledFontDWrite(const RefPtr<IDWriteFontFace>& aFontFace,
+                     const RefPtr<IDWriteFont>& aFont, bool aNeedsCairo = false)
       : mFontFace(aFontFace),
         mFont(aFont),
-        mSimulations(aSimulations),
         mNeedsCairo(aNeedsCairo) {}
 
   FontType GetType() const override { return FontType::DWRITE; }
 
   const RefPtr<IDWriteFontFace>& GetFontFace() const { return mFontFace; }
   const RefPtr<IDWriteFont>& GetFont() const { return mFont; }
-  DWRITE_FONT_SIMULATIONS GetSimulations() const { return mSimulations; }
 
   bool GetFontFileData(FontFileDataOutput aDataCallback, void* aBaton) override;
 
@@ -50,9 +45,11 @@
   bool GetWRFontDescriptor(WRFontDescriptorOutput aCb, void* aBaton) override;
 
  private:
+  bool InitBold();
+
   RefPtr<IDWriteFontFace> mFontFace;
+  RefPtr<IDWriteFontFace> mFontFaceBold;
   RefPtr<IDWriteFont> mFont;
-  DWRITE_FONT_SIMULATIONS mSimulations;
   bool mNeedsCairo;
 };
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/UnscaledFontFreeType.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/UnscaledFontFreeType.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/UnscaledFontFreeType.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/UnscaledFontFreeType.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -54,9 +54,11 @@
   bool success = false;
   FT_ULong length = 0;
   // Request the SFNT file. This may not always succeed for all font types.
-  if (FT_Load_Sfnt_Table(mFace, 0, 0, nullptr, &length) == FT_Err_Ok) {
+  if (FT_Load_Sfnt_Table(mFace->GetFace(), 0, 0, nullptr, &length) ==
+      FT_Err_Ok) {
     uint8_t* fontData = new uint8_t[length];
-    if (FT_Load_Sfnt_Table(mFace, 0, 0, fontData, &length) == FT_Err_Ok) {
+    if (FT_Load_Sfnt_Table(mFace->GetFace(), 0, 0, fontData, &length) ==
+        FT_Err_Ok) {
       aDataCallback(fontData, length, 0, aBaton);
       success = true;
     }
@@ -87,6 +89,21 @@
   return true;
 }
 
+RefPtr<SharedFTFace> UnscaledFontFreeType::InitFace() {
+  if (mFace) {
+    return mFace;
+  }
+  if (mFile.empty()) {
+    return nullptr;
+  }
+  mFace = Factory::NewSharedFTFace(nullptr, mFile.c_str(), mIndex);
+  if (!mFace) {
+    gfxWarning() << "Failed initializing FreeType face from filename";
+    return nullptr;
+  }
+  return mFace;
+}
+
 void UnscaledFontFreeType::GetVariationSettingsFromFace(
     std::vector<FontVariation>* aVariations, FT_Face aFace) {
   if (!aFace || !(aFace->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS)) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/UnscaledFontFreeType.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/UnscaledFontFreeType.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/UnscaledFontFreeType.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/UnscaledFontFreeType.h	2019-09-15 11:33:10.000000000 +0000
@@ -20,34 +20,20 @@
 class UnscaledFontFreeType : public UnscaledFont {
  public:
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(UnscaledFontFreeType, override)
-  explicit UnscaledFontFreeType(FT_Face aFace, bool aOwnsFace = false)
-      : mFace(aFace), mOwnsFace(aOwnsFace), mIndex(0) {}
-  explicit UnscaledFontFreeType(const char* aFile, uint32_t aIndex = 0)
-      : mFace(nullptr), mOwnsFace(false), mFile(aFile), mIndex(aIndex) {}
-  explicit UnscaledFontFreeType(std::string&& aFile, uint32_t aIndex = 0)
-      : mFace(nullptr),
-        mOwnsFace(false),
-        mFile(std::move(aFile)),
-        mIndex(aIndex) {}
-  UnscaledFontFreeType(FT_Face aFace, NativeFontResource* aNativeFontResource)
-      : mFace(aFace),
-        mOwnsFace(false),
-        mIndex(0),
-        mNativeFontResource(aNativeFontResource) {}
-  virtual ~UnscaledFontFreeType() {
-    if (mOwnsFace) {
-      Factory::ReleaseFTFace(mFace);
-    }
-  }
+  explicit UnscaledFontFreeType(const RefPtr<SharedFTFace>& aFace)
+      : mFace(aFace), mIndex(0) {}
+  explicit UnscaledFontFreeType(const char* aFile, uint32_t aIndex = 0,
+                                RefPtr<SharedFTFace> aFace = nullptr)
+      : mFace(std::move(aFace)), mFile(aFile), mIndex(aIndex) {}
+  explicit UnscaledFontFreeType(std::string&& aFile, uint32_t aIndex = 0,
+                                RefPtr<SharedFTFace> aFace = nullptr)
+      : mFace(std::move(aFace)), mFile(std::move(aFile)), mIndex(aIndex) {}
 
   FontType GetType() const override { return FontType::FREETYPE; }
 
-  FT_Face GetFace() const { return mFace; }
-  const char* GetFile() const { return mFile.c_str(); }
+  const RefPtr<SharedFTFace>& GetFace() const { return mFace; }
+  const std::string& GetFile() const { return mFile; }
   uint32_t GetIndex() const { return mIndex; }
-  const RefPtr<NativeFontResource>& GetNativeFontResource() const {
-    return mNativeFontResource;
-  }
 
   bool GetFontFileData(FontFileDataOutput aDataCallback, void* aBaton) override;
 
@@ -55,21 +41,24 @@
 
   bool GetWRFontDescriptor(WRFontDescriptorOutput aCb, void* aBaton) override;
 
-#ifdef MOZ_WIDGET_ANDROID
-  FT_Face InitFace();
+  RefPtr<SharedFTFace> InitFace();
 
+#ifdef MOZ_WIDGET_ANDROID
   already_AddRefed<ScaledFont> CreateScaledFont(
       Float aGlyphSize, const uint8_t* aInstanceData,
       uint32_t aInstanceDataLength, const FontVariation* aVariations,
       uint32_t aNumVariations) override;
+
+  already_AddRefed<ScaledFont> CreateScaledFontFromWRFont(
+      Float aGlyphSize, const wr::FontInstanceOptions* aOptions,
+      const wr::FontInstancePlatformOptions* aPlatformOptions,
+      const FontVariation* aVariations, uint32_t aNumVariations) override;
 #endif
 
  protected:
-  FT_Face mFace;
-  bool mOwnsFace;
+  RefPtr<SharedFTFace> mFace;
   std::string mFile;
   uint32_t mIndex;
-  RefPtr<NativeFontResource> mNativeFontResource;
 
   friend class ScaledFontFreeType;
   friend class ScaledFontFontconfig;
@@ -85,14 +74,14 @@
 class UnscaledFontFontconfig : public UnscaledFontFreeType {
  public:
   MOZ_DECLARE_REFCOUNTED_VIRTUAL_TYPENAME(UnscaledFontFontconfig, override)
-  explicit UnscaledFontFontconfig(FT_Face aFace, bool aOwnsFace = false)
-      : UnscaledFontFreeType(aFace, aOwnsFace) {}
-  explicit UnscaledFontFontconfig(const char* aFile, uint32_t aIndex = 0)
-      : UnscaledFontFreeType(aFile, aIndex) {}
-  explicit UnscaledFontFontconfig(std::string&& aFile, uint32_t aIndex = 0)
-      : UnscaledFontFreeType(std::move(aFile), aIndex) {}
-  UnscaledFontFontconfig(FT_Face aFace, NativeFontResource* aNativeFontResource)
-      : UnscaledFontFreeType(aFace, aNativeFontResource) {}
+  explicit UnscaledFontFontconfig(const RefPtr<SharedFTFace>& aFace)
+      : UnscaledFontFreeType(aFace) {}
+  explicit UnscaledFontFontconfig(const char* aFile, uint32_t aIndex = 0,
+                                  RefPtr<SharedFTFace> aFace = nullptr)
+      : UnscaledFontFreeType(aFile, aIndex, std::move(aFace)) {}
+  explicit UnscaledFontFontconfig(std::string&& aFile, uint32_t aIndex = 0,
+                                  RefPtr<SharedFTFace> aFace = nullptr)
+      : UnscaledFontFreeType(std::move(aFile), aIndex, std::move(aFace)) {}
 
   FontType GetType() const override { return FontType::FONTCONFIG; }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/UnscaledFontMac.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/UnscaledFontMac.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/2d/UnscaledFontMac.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/2d/UnscaledFontMac.h	2019-09-15 11:33:10.000000000 +0000
@@ -42,6 +42,11 @@
       uint32_t aInstanceDataLength, const FontVariation* aVariations,
       uint32_t aNumVariations) override;
 
+  already_AddRefed<ScaledFont> CreateScaledFontFromWRFont(
+      Float aGlyphSize, const wr::FontInstanceOptions* aOptions,
+      const wr::FontInstancePlatformOptions* aPlatformOptions,
+      const FontVariation* aVariations, uint32_t aNumVariations) override;
+
   static CGFontRef CreateCGFontWithVariations(CGFontRef aFont,
                                               uint32_t aVariationCount,
                                               const FontVariation* aVariations);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-font-options.c firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-font-options.c
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-font-options.c	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-font-options.c	2019-09-15 11:33:10.000000000 +0000
@@ -366,7 +366,7 @@
  * Since: 1.8
  **/
 void
-_cairo_font_options_set_lcd_filter (cairo_font_options_t *options,
+cairo_font_options_set_lcd_filter (cairo_font_options_t *options,
 				    cairo_lcd_filter_t    lcd_filter)
 {
     if (cairo_font_options_status (options))
@@ -374,6 +374,7 @@
 
     options->lcd_filter = lcd_filter;
 }
+slim_hidden_def (cairo_font_options_set_lcd_filter);
 
 /**
  * _cairo_font_options_get_lcd_filter:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-ft-font.c firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-ft-font.c
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-ft-font.c	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-ft-font.c	2019-09-15 11:33:10.000000000 +0000
@@ -105,13 +105,24 @@
  */
 #define MAX_FONT_SIZE 2000
 
-extern FT_Face mozilla_NewFTFace(FT_Library aFTLibrary, const char* aFileName, int aFaceIndex);
-extern FT_Face mozilla_NewFTFaceFromData(FT_Library aFTLibrary, const uint8_t* aData, size_t aDataSize, int aFaceIndex);
-extern void mozilla_ReleaseFTFace(FT_Face aFace);
+extern void mozilla_AddRefSharedFTFace(void* aContext);
+extern void mozilla_ReleaseSharedFTFace(void* aContext);
+/* Returns true if the face's state has been modifide by another owner. */
+extern int mozilla_LockSharedFTFace(void* aContext, void* aOwner);
+extern void mozilla_UnlockSharedFTFace(void* aContext);
 extern FT_Error mozilla_LoadFTGlyph(FT_Face aFace, uint32_t aGlyphIndex, int32_t aFlags);
 extern void mozilla_LockFTLibrary(FT_Library aFTLibrary);
 extern void mozilla_UnlockFTLibrary(FT_Library aFTLibrary);
 
+#define CAIRO_FT_LOCK(unscaled)                                         \
+  ((unscaled)->face_context                                             \
+       ? (void)mozilla_LockSharedFTFace((unscaled)->face_context, NULL) \
+       : (void)CAIRO_MUTEX_LOCK((unscaled)->mutex))
+#define CAIRO_FT_UNLOCK(unscaled)                                   \
+  ((unscaled)->face_context                                         \
+       ? mozilla_UnlockSharedFTFace((unscaled)->face_context) \
+       : (void)CAIRO_MUTEX_UNLOCK((unscaled)->mutex))
+
 /**
  * SECTION:cairo-ft
  * @Title: FreeType Fonts
@@ -161,15 +172,12 @@
 
     cairo_bool_t from_face; /* was the FT_Face provided by user? */
     FT_Face face;	    /* provided or cached face */
+    void *face_context;
 
     /* only set if from_face is false */
     char *filename;
     int id;
 
-    /* For variation fonts, the variation coordinates to apply to each axis. */
-    const FT_Fixed *var_coords;
-    int num_var_coords;
-
     /* We temporarily scale the unscaled font as needed */
     cairo_bool_t have_scale;
     cairo_matrix_t current_scale;
@@ -192,15 +200,10 @@
 static void
 _cairo_ft_unscaled_font_fini (cairo_ft_unscaled_font_t *unscaled);
 
-typedef enum _cairo_ft_extra_flags {
-    CAIRO_FT_OPTIONS_HINT_METRICS = (1 << 0),
-    CAIRO_FT_OPTIONS_EMBOLDEN = (1 << 1)
-} cairo_ft_extra_flags_t;
-
 typedef struct _cairo_ft_options {
     cairo_font_options_t    base;
     int			    load_flags;	 /* flags for FT_Load_Glyph */
-    cairo_ft_extra_flags_t  extra_flags; /* other flags that affect results */
+    unsigned int synth_flags;
 } cairo_ft_options_t;
 
 struct _cairo_ft_font_face {
@@ -255,7 +258,7 @@
 				  cairo_ft_unscaled_font_t *unscaled)
 {
     if (unscaled->face) {
-	mozilla_ReleaseFTFace (unscaled->face);
+	FT_Done_Face (unscaled->face);
 	unscaled->face = NULL;
 	unscaled->have_scale = FALSE;
 
@@ -309,8 +312,11 @@
     _cairo_hash_table_remove (font_map->hash_table,
 			      &unscaled->base.hash_entry);
 
-    if (! unscaled->from_face)
+    if (unscaled->from_face) {
+	mozilla_ReleaseSharedFTFace (unscaled->face_context);
+    } else {
 	_font_map_release_face_lock_held (font_map, unscaled);
+    }
 
     _cairo_ft_unscaled_font_fini (unscaled);
     free (unscaled);
@@ -366,9 +372,8 @@
 				  cairo_bool_t              from_face,
 				  char			   *filename,
 				  int			    id,
-                                  const FT_Fixed           *var_coords,
-                                  int                       num_var_coords,
-				  FT_Face		    face)
+				  FT_Face		    face,
+				  void			   *face_context)
 {
     unsigned long hash;
 
@@ -376,16 +381,13 @@
     key->filename = filename;
     key->id = id;
     key->face = face;
-    key->var_coords = var_coords;
-    key->num_var_coords = num_var_coords;
+    key->face_context = face_context;
 
     hash = _cairo_hash_string (filename);
     /* the constants are just arbitrary primes */
     hash += ((unsigned long) id) * 1607;
     hash += ((unsigned long) face) * 2137;
 
-    hash = _cairo_hash_bytes (hash, var_coords, num_var_coords * sizeof(FT_Fixed));
-
     key->base.hash_entry.hash = hash;
 }
 
@@ -415,27 +417,27 @@
 			      cairo_bool_t              from_face,
 			      const char	       *filename,
 			      int			id,
-                              const FT_Fixed           *var_coords,
-                              int                       num_var_coords,
-			      FT_Face			face)
+			      FT_Face			face,
+			      void		       *face_context)
 {
     _cairo_unscaled_font_init (&unscaled->base,
 			       &cairo_ft_unscaled_font_backend);
 
     if (from_face) {
 	unscaled->from_face = TRUE;
-	_cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, 0, var_coords, num_var_coords, face);
+	_cairo_ft_unscaled_font_init_key (unscaled, TRUE, NULL, 0, face, face_context);
     } else {
 	char *filename_copy;
 
 	unscaled->from_face = FALSE;
 	unscaled->face = NULL;
+	unscaled->face_context = NULL;
 
 	filename_copy = strdup (filename);
 	if (unlikely (filename_copy == NULL))
 	    return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-	_cairo_ft_unscaled_font_init_key (unscaled, FALSE, filename_copy, id, var_coords, num_var_coords, NULL);
+	_cairo_ft_unscaled_font_init_key (unscaled, FALSE, filename_copy, id, NULL, NULL);
     }
 
     unscaled->have_scale = FALSE;
@@ -468,11 +470,6 @@
 	unscaled->filename = NULL;
     }
 
-    if (unscaled->var_coords) {
-        free (unscaled->var_coords);
-        unscaled->var_coords = NULL;
-    }
-
     CAIRO_MUTEX_FINI (unscaled->mutex);
 }
 
@@ -484,17 +481,12 @@
     const cairo_ft_unscaled_font_t *unscaled_b = key_b;
 
     if (unscaled_a->id == unscaled_b->id &&
-	unscaled_a->from_face == unscaled_b->from_face &&
-        unscaled_a->num_var_coords == unscaled_b->num_var_coords)
+	unscaled_a->from_face == unscaled_b->from_face)
     {
         if (unscaled_a->from_face)
 	    return unscaled_a->face == unscaled_b->face;
 
-        if (unscaled_a->num_var_coords > 0 &&
-            (memcmp (unscaled_a->var_coords, unscaled_b->var_coords,
-                     unscaled_a->num_var_coords * sizeof(FT_Fixed)) != 0))
-            return FALSE;
-	else if (unscaled_a->filename == NULL && unscaled_b->filename == NULL)
+	if (unscaled_a->filename == NULL && unscaled_b->filename == NULL)
 	    return TRUE;
 	else if (unscaled_a->filename == NULL || unscaled_b->filename == NULL)
 	    return FALSE;
@@ -513,20 +505,18 @@
 					 char *filename,
 					 int id,
 					 FT_Face font_face,
-                                         const FT_Fixed *var_coords,
-                                         int num_var_coords,
+					 void *face_context,
 					 cairo_ft_unscaled_font_t **out)
 {
     cairo_ft_unscaled_font_t key, *unscaled;
     cairo_ft_unscaled_font_map_t *font_map;
-    FT_Fixed* new_var_coords = NULL;
     cairo_status_t status;
 
     font_map = _cairo_ft_unscaled_font_map_lock ();
     if (unlikely (font_map == NULL))
 	return _cairo_error (CAIRO_STATUS_NO_MEMORY);
 
-    _cairo_ft_unscaled_font_init_key (&key, from_face, filename, id, var_coords, num_var_coords, font_face);
+    _cairo_ft_unscaled_font_init_key (&key, from_face, filename, id, font_face, face_context);
 
     /* Return existing unscaled font if it exists in the hash table. */
     unscaled = _cairo_hash_table_lookup (font_map->hash_table,
@@ -543,17 +533,7 @@
 	goto UNWIND_FONT_MAP_LOCK;
     }
 
-    /* If we have variation coordinate data, make a copy to save in the unscaled_font */
-    if (var_coords && num_var_coords) {
-        new_var_coords = malloc (num_var_coords * sizeof(FT_Fixed));
-        if (unlikely (!new_var_coords)) {
-            status = _cairo_error (CAIRO_STATUS_NO_MEMORY);
-            goto UNWIND_VAR_COORDS;
-        }
-        memcpy (new_var_coords, var_coords, num_var_coords * sizeof(FT_Fixed));
-    }
-
-    status = _cairo_ft_unscaled_font_init (unscaled, from_face, filename, id, new_var_coords, num_var_coords, font_face);
+    status = _cairo_ft_unscaled_font_init (unscaled, from_face, filename, id, font_face, face_context);
     if (unlikely (status))
 	goto UNWIND_UNSCALED_MALLOC;
 
@@ -563,6 +543,8 @@
     if (unlikely (status))
 	goto UNWIND_UNSCALED_FONT_INIT;
 
+    mozilla_AddRefSharedFTFace (face_context);
+
 DONE:
     _cairo_ft_unscaled_font_map_unlock ();
     *out = unscaled;
@@ -572,8 +554,6 @@
     _cairo_ft_unscaled_font_fini (unscaled);
 UNWIND_UNSCALED_MALLOC:
     free (unscaled);
-UNWIND_VAR_COORDS:
-    free (new_var_coords);
 UNWIND_FONT_MAP_LOCK:
     _cairo_ft_unscaled_font_map_unlock ();
     return status;
@@ -583,7 +563,6 @@
 #if CAIRO_HAS_FC_FONT
 static cairo_status_t
 _cairo_ft_unscaled_font_create_for_pattern (FcPattern *pattern,
-                                            const FT_Fixed *var_coords, int num_var_coords,
 					    cairo_ft_unscaled_font_t **out)
 {
     FT_Face font_face = NULL;
@@ -615,18 +594,17 @@
 
 DONE:
     return _cairo_ft_unscaled_font_create_internal (font_face != NULL,
-						    filename, id, font_face,
-                                                    var_coords, num_var_coords,
+						    filename, id, font_face, NULL,
 						    out);
 }
 #endif
 
 static cairo_status_t
-_cairo_ft_unscaled_font_create_from_face (FT_Face face, const FT_Fixed *var_coords, int num_var_coords,
+_cairo_ft_unscaled_font_create_from_face (FT_Face face,
+					  void *face_context,
 					  cairo_ft_unscaled_font_t **out)
 {
-    return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, 0, face,
-                                                    var_coords, num_var_coords, out);
+    return _cairo_ft_unscaled_font_create_internal (TRUE, NULL, 0, face, face_context, out);
 }
 
 static void
@@ -658,14 +636,16 @@
 	if (unscaled->faces && unscaled->faces->unscaled == NULL) {
 	    assert (unscaled->faces->next == NULL);
 	    // Guard user-data destruction with the unscaled font mutex.
-	    CAIRO_MUTEX_LOCK (unscaled->mutex);
+	    CAIRO_FT_LOCK (unscaled);
 	    cairo_font_face_destroy (&unscaled->faces->base);
-	    CAIRO_MUTEX_UNLOCK (unscaled->mutex);
+	    CAIRO_FT_UNLOCK (unscaled);
 	}
+        mozilla_ReleaseSharedFTFace (unscaled->face_context);
     } else {
 	_font_map_release_face_lock_held (font_map, unscaled);
     }
     unscaled->face = NULL;
+    unscaled->face_context = NULL;
 
     _cairo_ft_unscaled_font_map_unlock ();
 
@@ -691,8 +671,15 @@
 {
     cairo_ft_unscaled_font_map_t *font_map;
     FT_Face face = NULL;
+    FT_Error error;
 
-    CAIRO_MUTEX_LOCK (unscaled->mutex);
+    if (unscaled->face_context) {
+	if (!mozilla_LockSharedFTFace(unscaled->face_context, unscaled)) {
+	    unscaled->have_scale = FALSE;
+	}
+    } else {
+	CAIRO_FT_LOCK(unscaled);
+    }
     unscaled->lock_count++;
 
     if (unscaled->face)
@@ -733,32 +720,15 @@
     }
     _cairo_ft_unscaled_font_map_unlock ();
 
-    face = mozilla_NewFTFace (font_map->ft_library, unscaled->filename, unscaled->id);
-    if (!face)
+    error = FT_New_Face (font_map->ft_library, unscaled->filename, unscaled->id, &face);
+    if (error)
     {
 	unscaled->lock_count--;
-	CAIRO_MUTEX_UNLOCK (unscaled->mutex);
+	CAIRO_FT_UNLOCK (unscaled);
 	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
 	return NULL;
     }
 
-    if (unscaled->var_coords) {
-#if MOZ_TREE_FREETYPE
-        FT_Set_Var_Design_Coordinates(face, unscaled->num_var_coords, unscaled->var_coords);
-#else
-        typedef FT_Error (*SetCoordsFunc)(FT_Face, FT_UInt, FT_Fixed*);
-        static SetCoordsFunc setCoords;
-        static cairo_bool_t firstTime = TRUE;
-        if (firstTime) {
-            firstTime = FALSE;
-            (SetCoordsFunc)dlsym(RTLD_DEFAULT, "FT_Set_Var_Design_Coordinates");
-        }
-        if (setCoords) {
-            (*setCoords)(face, unscaled->num_var_coords, unscaled->var_coords);
-        }
-#endif
-    }
-
     unscaled->face = face;
 
     font_map->num_open_faces++;
@@ -776,7 +746,7 @@
 
     unscaled->lock_count--;
 
-    CAIRO_MUTEX_UNLOCK (unscaled->mutex);
+    CAIRO_FT_UNLOCK (unscaled);
 }
 
 
@@ -1772,7 +1742,7 @@
 
     _cairo_font_options_init_default (&ft_options.base);
     ft_options.load_flags = FT_LOAD_DEFAULT;
-    ft_options.extra_flags = 0;
+    ft_options.synth_flags = 0;
 
 #ifndef FC_EMBEDDED_BITMAP
 #define FC_EMBEDDED_BITMAP "embeddedbitmap"
@@ -1908,7 +1878,7 @@
 	embolden = FcFalse;
 
     if (embolden)
-	ft_options.extra_flags |= CAIRO_FT_OPTIONS_EMBOLDEN;
+	ft_options.synth_flags |= CAIRO_FT_SYNTHESIZE_BOLD;
 
     *ret = ft_options;
 }
@@ -1991,9 +1961,7 @@
     }
 
     options->load_flags = load_flags | load_target;
-    options->extra_flags = other->extra_flags;
-    if (options->base.hint_metrics != CAIRO_HINT_METRICS_OFF)
-	options->extra_flags |= CAIRO_FT_OPTIONS_HINT_METRICS;
+    options->synth_flags = other->synth_flags;
 }
 
 static cairo_status_t
@@ -2364,7 +2332,7 @@
     /*
      * embolden glyphs if requested
      */
-    if (scaled_font->ft_options.extra_flags & CAIRO_FT_OPTIONS_EMBOLDEN)
+    if (scaled_font->ft_options.synth_flags & CAIRO_FT_SYNTHESIZE_BOLD)
 	FT_GlyphSlot_Embolden (glyph);
 #endif
 
@@ -2515,7 +2483,7 @@
 	    /*
 	     * embolden glyphs if requested
 	     */
-	    if (scaled_font->ft_options.extra_flags & CAIRO_FT_OPTIONS_EMBOLDEN)
+	    if (scaled_font->ft_options.synth_flags & CAIRO_FT_SYNTHESIZE_BOLD)
 		FT_GlyphSlot_Embolden (glyph);
 #endif
 	    if (vertical_layout)
@@ -2728,7 +2696,7 @@
 
     if (font_face->unscaled)
     {
-	CAIRO_MUTEX_LOCK (font_face->unscaled->mutex);
+	CAIRO_FT_LOCK (font_face->unscaled);
 
 	if (font_face->unscaled->from_face &&
 	    font_face->next == NULL &&
@@ -2737,7 +2705,7 @@
 	{
 	    cairo_font_face_reference (&font_face->base);
 
-	    CAIRO_MUTEX_UNLOCK (font_face->unscaled->mutex);
+	    CAIRO_FT_UNLOCK (font_face->unscaled);
 	    _cairo_unscaled_font_destroy (&font_face->unscaled->base);
 	    font_face->unscaled = NULL;
 	    return;
@@ -2764,7 +2732,7 @@
 	// Ensure user-data destruction happens within the unscaled font mutex.
 	_cairo_user_data_array_fini (&font_face->base.user_data);
 
-	CAIRO_MUTEX_UNLOCK (font_face->unscaled->mutex);
+	CAIRO_FT_UNLOCK (font_face->unscaled);
 	_cairo_unscaled_font_destroy (&font_face->unscaled->base);
 	font_face->unscaled = NULL;
     }
@@ -2839,7 +2807,7 @@
 {
     cairo_ft_font_face_t *font_face = abstract_face;
     if (font_face->unscaled) {
-	CAIRO_MUTEX_LOCK (font_face->unscaled->mutex);
+	CAIRO_FT_LOCK (font_face->unscaled);
     }
 }
 
@@ -2848,7 +2816,7 @@
 {
     cairo_ft_font_face_t *font_face = abstract_face;
     if (font_face->unscaled) {
-	CAIRO_MUTEX_UNLOCK (font_face->unscaled->mutex);
+	CAIRO_FT_UNLOCK (font_face->unscaled);
     }
 }
 
@@ -2902,7 +2870,7 @@
 {
     cairo_ft_font_face_t *font_face, **prev_font_face;
 
-    CAIRO_MUTEX_LOCK (unscaled->mutex);
+    CAIRO_FT_LOCK (unscaled);
 
     /* Looked for an existing matching font face */
     for (font_face = unscaled->faces, prev_font_face = &unscaled->faces;
@@ -2910,7 +2878,7 @@
 	 prev_font_face = &font_face->next, font_face = font_face->next)
     {
 	if (font_face->ft_options.load_flags == ft_options->load_flags &&
-	    font_face->ft_options.extra_flags == ft_options->extra_flags &&
+	    font_face->ft_options.synth_flags == ft_options->synth_flags &&
 	    cairo_font_options_equal (&font_face->ft_options.base, &ft_options->base))
 	{
 	    if (font_face->base.status) {
@@ -2929,7 +2897,7 @@
 		cairo_font_face_reference (&font_face->base);
 	    }
 
-	    CAIRO_MUTEX_UNLOCK (unscaled->mutex);
+	    CAIRO_FT_UNLOCK (unscaled);
 	    return &font_face->base;
 	}
     }
@@ -2937,7 +2905,7 @@
     /* No match found, create a new one */
     font_face = malloc (sizeof (cairo_ft_font_face_t));
     if (unlikely (!font_face)) {
-	CAIRO_MUTEX_UNLOCK (unscaled->mutex);
+	CAIRO_FT_UNLOCK (unscaled);
 	_cairo_error_throw (CAIRO_STATUS_NO_MEMORY);
 	return (cairo_font_face_t *)&_cairo_font_face_nil;
     }
@@ -2965,7 +2933,7 @@
 
     _cairo_font_face_init (&font_face->base, &_cairo_ft_font_face_backend);
 
-    CAIRO_MUTEX_UNLOCK (unscaled->mutex);
+    CAIRO_FT_UNLOCK (unscaled);
     return &font_face->base;
 }
 
@@ -3175,7 +3143,7 @@
 	goto FREE_PATTERN;
     }
 
-    status = _cairo_ft_unscaled_font_create_for_pattern (resolved, NULL, 0, &unscaled);
+    status = _cairo_ft_unscaled_font_create_for_pattern (resolved, &unscaled);
     if (unlikely (status || unscaled == NULL)) {
 	font_face = (cairo_font_face_t *)&_cairo_font_face_nil;
 	goto FREE_RESOLVED;
@@ -3232,8 +3200,7 @@
  *  cairo_font_face_destroy() when you are done using it.
  **/
 cairo_font_face_t *
-cairo_ft_font_face_create_for_pattern (FcPattern *pattern,
-                                       const FT_Fixed *var_coords, int num_var_coords)
+cairo_ft_font_face_create_for_pattern (FcPattern *pattern)
 {
     cairo_ft_unscaled_font_t *unscaled;
     cairo_font_face_t *font_face;
@@ -3241,7 +3208,6 @@
     cairo_status_t status;
 
     status = _cairo_ft_unscaled_font_create_for_pattern (pattern,
-                                                         var_coords, num_var_coords,
                                                          &unscaled);
     if (unlikely (status))
 	return (cairo_font_face_t *) &_cairo_font_face_nil;
@@ -3313,22 +3279,21 @@
 cairo_font_face_t *
 cairo_ft_font_face_create_for_ft_face (FT_Face         face,
 				       int             load_flags,
-                                       const FT_Fixed *var_coords,
-                                       int             num_var_coords)
+				       unsigned int    synth_flags,
+				       void	      *face_context)
 {
     cairo_ft_unscaled_font_t *unscaled;
     cairo_font_face_t *font_face;
     cairo_ft_options_t ft_options;
     cairo_status_t status;
 
-    status = _cairo_ft_unscaled_font_create_from_face (face,
-                                                       var_coords, num_var_coords,
+    status = _cairo_ft_unscaled_font_create_from_face (face, face_context,
                                                        &unscaled);
     if (unlikely (status))
 	return (cairo_font_face_t *)&_cairo_font_face_nil;
 
     ft_options.load_flags = load_flags;
-    ft_options.extra_flags = 0;
+    ft_options.synth_flags = synth_flags;
     _cairo_font_options_init_default (&ft_options.base);
 
     font_face = _cairo_ft_font_face_create (unscaled, &ft_options);
@@ -3402,8 +3367,7 @@
      * opportunity for creating deadlock. This is obviously unsafe,
      * but as documented, the user must add manual locking when using
      * this function. */
-    // BEWARE: Mozilla's tree Cairo keeps the lock across calls for thread-safety.
-    // CAIRO_MUTEX_UNLOCK (scaled_font->unscaled->mutex);
+    CAIRO_FT_UNLOCK(scaled_font->unscaled);
 
     return face;
 }
@@ -3434,8 +3398,7 @@
      * cairo_ft_scaled_font_lock_face, so we have to acquire it again
      * as _cairo_ft_unscaled_font_unlock_face expects it to be held
      * when we call into it. */
-    // BEWARE: Mozilla's tree Cairo keeps the lock across calls for thread-safety.
-    //CAIRO_MUTEX_LOCK (scaled_font->unscaled->mutex);
+    CAIRO_FT_LOCK(scaled_font->unscaled);
 
     _cairo_ft_unscaled_font_unlock_face (scaled_font->unscaled);
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-ft.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-ft.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-ft.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-ft.h	2019-09-15 11:33:10.000000000 +0000
@@ -52,11 +52,16 @@
 
 CAIRO_BEGIN_DECLS
 
+typedef enum {
+    CAIRO_FT_SYNTHESIZE_BOLD = 1 << 0,
+    CAIRO_FT_SYNTHESIZE_OBLIQUE = 1 << 1
+} cairo_ft_synthesize_t;
+
 cairo_public cairo_font_face_t *
 cairo_ft_font_face_create_for_ft_face (FT_Face         face,
 				       int             load_flags,
-                                       const FT_Fixed *var_coords,
-                                       int             num_var_coords);
+				       unsigned int    synth_flags,
+				       void	      *face_context);
 
 cairo_public FT_Face
 cairo_ft_scaled_font_lock_face (cairo_scaled_font_t *scaled_font);
@@ -67,9 +72,7 @@
 #if CAIRO_HAS_FC_FONT
 
 cairo_public cairo_font_face_t *
-cairo_ft_font_face_create_for_pattern (FcPattern      *pattern,
-                                       const FT_Fixed *var_coords,
-                                       int             num_var_coords);
+cairo_ft_font_face_create_for_pattern (FcPattern      *pattern);
 
 cairo_public void
 cairo_ft_font_options_substitute (const cairo_font_options_t *options,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo.h	2019-09-15 11:33:10.000000000 +0000
@@ -1200,6 +1200,30 @@
 } cairo_hint_metrics_t;
 
 /**
+ * cairo_lcd_filter_t:
+ * @CAIRO_LCD_FILTER_DEFAULT: Use the default LCD filter for
+ *   font backend and target device
+ * @CAIRO_LCD_FILTER_NONE: Do not perform LCD filtering
+ * @CAIRO_LCD_FILTER_INTRA_PIXEL: Intra-pixel filter
+ * @CAIRO_LCD_FILTER_FIR3: FIR filter with a 3x3 kernel
+ * @CAIRO_LCD_FILTER_FIR5: FIR filter with a 5x5 kernel
+ *
+ * The LCD filter specifies the low-pass filter applied to LCD-optimized
+ * bitmaps generated with an antialiasing mode of %CAIRO_ANTIALIAS_SUBPIXEL.
+ *
+ * Note: This API was temporarily made available in the public
+ * interface during the 1.7.x development series, but was made private
+ * before 1.8.
+ **/
+typedef enum _cairo_lcd_filter {
+    CAIRO_LCD_FILTER_DEFAULT,
+    CAIRO_LCD_FILTER_NONE,
+    CAIRO_LCD_FILTER_INTRA_PIXEL,
+    CAIRO_LCD_FILTER_FIR3,
+    CAIRO_LCD_FILTER_FIR5
+} cairo_lcd_filter_t;
+
+/**
  * cairo_font_options_t:
  *
  * An opaque structure holding all options that are used when
@@ -1267,6 +1291,10 @@
 cairo_public cairo_hint_metrics_t
 cairo_font_options_get_hint_metrics (const cairo_font_options_t *options);
 
+cairo_public void
+cairo_font_options_set_lcd_filter (cairo_font_options_t   *options,
+                    cairo_lcd_filter_t  lcd_filter);
+
 /* This interface is for dealing with text as text, not caring about the
    font object inside the the cairo_t. */
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairoint.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairoint.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairoint.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairoint.h	2019-09-15 11:33:10.000000000 +0000
@@ -1106,10 +1106,6 @@
 _cairo_font_options_init_copy (cairo_font_options_t		*options,
 			       const cairo_font_options_t	*other);
 
-cairo_private void
-_cairo_font_options_set_lcd_filter (cairo_font_options_t   *options,
-				   cairo_lcd_filter_t  lcd_filter);
-
 cairo_private cairo_lcd_filter_t
 _cairo_font_options_get_lcd_filter (const cairo_font_options_t *options);
 
@@ -2423,6 +2419,7 @@
 slim_hidden_proto (cairo_font_options_set_antialias);
 slim_hidden_proto (cairo_font_options_set_hint_metrics);
 slim_hidden_proto (cairo_font_options_set_hint_style);
+slim_hidden_proto (cairo_font_options_set_lcd_filter);
 slim_hidden_proto (cairo_font_options_set_subpixel_order);
 slim_hidden_proto (cairo_font_options_status);
 slim_hidden_proto (cairo_format_stride_for_width);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-rename.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-rename.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-rename.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-rename.h	2019-09-15 11:33:10.000000000 +0000
@@ -83,6 +83,7 @@
 #define cairo_format_stride_for_width _moz_cairo_format_stride_for_width
 #define cairo_ft_font_face_create_for_ft_face _moz_cairo_ft_font_face_create_for_ft_face
 #define cairo_ft_font_face_create_for_pattern _moz_cairo_ft_font_face_create_for_pattern
+#define cairo_ft_font_face_set_synthesize _moz_cairo_ft_font_face_set_synthesize
 #define cairo_ft_font_options_substitute _moz_cairo_ft_font_options_substitute
 #define cairo_ft_scaled_font_lock_face _moz_cairo_ft_scaled_font_lock_face
 #define cairo_ft_scaled_font_unlock_face _moz_cairo_ft_scaled_font_unlock_face
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-types-private.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-types-private.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-types-private.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-types-private.h	2019-09-15 11:33:10.000000000 +0000
@@ -137,30 +137,6 @@
     cairo_bool_t is_snapshot;
 };
 
-/**
- * cairo_lcd_filter_t:
- * @CAIRO_LCD_FILTER_DEFAULT: Use the default LCD filter for
- *   font backend and target device
- * @CAIRO_LCD_FILTER_NONE: Do not perform LCD filtering
- * @CAIRO_LCD_FILTER_INTRA_PIXEL: Intra-pixel filter
- * @CAIRO_LCD_FILTER_FIR3: FIR filter with a 3x3 kernel
- * @CAIRO_LCD_FILTER_FIR5: FIR filter with a 5x5 kernel
- *
- * The LCD filter specifies the low-pass filter applied to LCD-optimized
- * bitmaps generated with an antialiasing mode of %CAIRO_ANTIALIAS_SUBPIXEL.
- *
- * Note: This API was temporarily made available in the public
- * interface during the 1.7.x development series, but was made private
- * before 1.8.
- **/
-typedef enum _cairo_lcd_filter {
-    CAIRO_LCD_FILTER_DEFAULT,
-    CAIRO_LCD_FILTER_NONE,
-    CAIRO_LCD_FILTER_INTRA_PIXEL,
-    CAIRO_LCD_FILTER_FIR3,
-    CAIRO_LCD_FILTER_FIR5
-} cairo_lcd_filter_t;
-
 typedef enum _cairo_round_glyph_positions {
     CAIRO_ROUND_GLYPH_POS_DEFAULT,
     CAIRO_ROUND_GLYPH_POS_ON,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-xlib-screen.c firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-xlib-screen.c
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/cairo/cairo/src/cairo-xlib-screen.c	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/cairo/cairo/src/cairo-xlib-screen.c	2019-09-15 11:33:10.000000000 +0000
@@ -262,7 +262,7 @@
     cairo_font_options_set_hint_style (&info->font_options, hint_style);
     cairo_font_options_set_antialias (&info->font_options, antialias);
     cairo_font_options_set_subpixel_order (&info->font_options, subpixel_order);
-    _cairo_font_options_set_lcd_filter (&info->font_options, lcd_filter);
+    cairo_font_options_set_lcd_filter (&info->font_options, lcd_filter);
     cairo_font_options_set_hint_metrics (&info->font_options, CAIRO_HINT_METRICS_ON);
 }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/docs/AdvancedLayers.rst firefox-trunk-71.0~a1~hg20190915r493291/gfx/docs/AdvancedLayers.rst
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/docs/AdvancedLayers.rst	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/docs/AdvancedLayers.rst	2019-09-15 11:33:11.000000000 +0000
@@ -186,7 +186,7 @@
 within a batch. And if using the depth buffer, we cannot write
 transparent pixels for the clipped area. As a result we always clip
 opaque draw rects in the vertex shader (and sometimes even on the CPU,
-as is needed for sane texture coordiantes). Only transparent items are
+as is needed for sane texture coordinates). Only transparent items are
 clipped in the pixel shader. As a result, masked layers and layers with
 non-rectangular transforms are always considered transparent, and use a
 more flexible clipping pipeline.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/apz/src/APZCTreeManager.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/apz/src/APZCTreeManager.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/apz/src/APZCTreeManager.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/apz/src/APZCTreeManager.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -930,6 +930,17 @@
 }
 
 template <class ScrollNode>
+void SetHitTestData(HitTestingTreeNode* aNode, HitTestingTreeNode* aParent,
+                    const ScrollNode& aLayer,
+                    const Maybe<ParentLayerIntRegion>& aClipRegion) {
+  aNode->SetHitTestData(
+      GetEventRegions(aLayer), aLayer.GetVisibleRegion(),
+      aLayer.GetRemoteDocumentRect(), aLayer.GetTransformTyped(), aClipRegion,
+      GetEventRegionsOverride(aParent, aLayer), aLayer.IsBackfaceHidden(),
+      !!aLayer.IsAsyncZoomContainer());
+}
+
+template <class ScrollNode>
 HitTestingTreeNode* APZCTreeManager::PrepareNodeForLayer(
     const RecursiveMutexAutoLock& aProofOfTreeLock, const ScrollNode& aLayer,
     const FrameMetrics& aMetrics, LayersId aLayersId,
@@ -969,14 +980,10 @@
     // when those properties change.
     node = RecycleOrCreateNode(aProofOfTreeLock, aState, nullptr, aLayersId);
     AttachNodeToTree(node, aParent, aNextSibling);
-    node->SetHitTestData(
-        GetEventRegions(aLayer), aLayer.GetVisibleRegion(),
-        aLayer.GetRemoteDocumentRect(), aLayer.GetTransformTyped(),
-        (!parentHasPerspective && aLayer.GetClipRect())
-            ? Some(ParentLayerIntRegion(*aLayer.GetClipRect()))
-            : Nothing(),
-        GetEventRegionsOverride(aParent, aLayer), aLayer.IsBackfaceHidden(),
-        !!aLayer.IsAsyncZoomContainer());
+    SetHitTestData(node, aParent, aLayer,
+                   (!parentHasPerspective && aLayer.GetClipRect())
+                       ? Some(ParentLayerIntRegion(*aLayer.GetClipRect()))
+                       : Nothing());
     node->SetScrollbarData(aLayer.GetScrollbarAnimationId(),
                            aLayer.GetScrollbarData());
     node->SetFixedPosData(aLayer.GetFixedPositionScrollContainerId());
@@ -1095,11 +1102,7 @@
 
     Maybe<ParentLayerIntRegion> clipRegion =
         parentHasPerspective ? Nothing() : ComputeClipRegion(aLayer);
-    node->SetHitTestData(
-        GetEventRegions(aLayer), aLayer.GetVisibleRegion(),
-        aLayer.GetRemoteDocumentRect(), aLayer.GetTransformTyped(), clipRegion,
-        GetEventRegionsOverride(aParent, aLayer), aLayer.IsBackfaceHidden(),
-        !!aLayer.IsAsyncZoomContainer());
+    SetHitTestData(node, aParent, aLayer, clipRegion);
     apzc->SetAncestorTransform(aAncestorTransform);
 
     PrintAPZCInfo(aLayer, apzc);
@@ -1199,11 +1202,7 @@
 
     Maybe<ParentLayerIntRegion> clipRegion =
         parentHasPerspective ? Nothing() : ComputeClipRegion(aLayer);
-    node->SetHitTestData(
-        GetEventRegions(aLayer), aLayer.GetVisibleRegion(),
-        aLayer.GetRemoteDocumentRect(), aLayer.GetTransformTyped(), clipRegion,
-        GetEventRegionsOverride(aParent, aLayer), aLayer.IsBackfaceHidden(),
-        !!aLayer.IsAsyncZoomContainer());
+    SetHitTestData(node, aParent, aLayer, clipRegion);
   }
 
   // Note: if layer properties must be propagated to nodes, RecvUpdate in
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/apz/test/mochitest/browser_test_group_fission.js firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/apz/test/mochitest/browser_test_group_fission.js
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/apz/test/mochitest/browser_test_group_fission.js	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/apz/test/mochitest/browser_test_group_fission.js	2019-09-15 11:33:10.000000000 +0000
@@ -4,6 +4,7 @@
       // To avoid throttling requestAnimationFrame callbacks in invisible
       // iframes
       ["layout.throttled_frame_rate", 60],
+      ["dom.animations-api.getAnimations.enabled", true],
     ],
   });
 });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/apz/test/reftest/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/apz/test/reftest/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/apz/test/reftest/reftest.list	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/apz/test/reftest/reftest.list	2019-09-15 11:33:10.000000000 +0000
@@ -1,11 +1,11 @@
 # The following tests test the async positioning of the scrollbars.
 # Basic root-frame scrollbar with async scrolling
-fuzzy-if(Android,0-1,0-2) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
-fuzzy-if(Android,0-4,0-5) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
-fuzzy-if(Android,0-3,0-5) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html
-fuzzy-if(Android,0-1,0-2) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html
-fuzzy-if(Android,0-4,0-5) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html
-fuzzy-if(Android,0-3,0-7) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html
+fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&&gtkWidget,14-14,24-24) fuzzy-if(webrender&&cocoaWidget,23-23,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v.html async-scrollbar-1-v-ref.html
+fuzzy-if(Android,0-4,0-5) fuzzy-if(webrender&&gtkWidget,53-53,14-14) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h.html async-scrollbar-1-h-ref.html
+fuzzy-if(Android,0-6,0-6) fuzzy-if(webrender&&gtkWidget,15-15,38-38) fuzzy-if(webrender&&cocoaWidget,18-18,79-79) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh.html async-scrollbar-1-vh-ref.html
+fuzzy-if(Android,0-1,0-2) fuzzy-if(webrender&&gtkWidget,14-14,24-24) fuzzy-if(webrender&&cocoaWidget,23-23,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-v-rtl.html async-scrollbar-1-v-rtl-ref.html
+fuzzy-if(Android,0-14,0-5) fuzzy-if(webrender&&gtkWidget,53-53,14-14) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-h-rtl.html async-scrollbar-1-h-rtl-ref.html
+fuzzy-if(Android,0-8,0-8) fuzzy-if(webrender&&gtkWidget,39-39,38-38) fuzzy-if(webrender&&cocoaWidget,18-18,43-43) skip-if(!asyncPan) pref(apz.allow_zooming,true) == async-scrollbar-1-vh-rtl.html async-scrollbar-1-vh-rtl-ref.html
 
 # Different async zoom levels. Since the scrollthumb gets async-scaled in the
 # compositor, the border-radius ends of the scrollthumb are going to be a little
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/wr/AsyncImagePipelineManager.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/wr/AsyncImagePipelineManager.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/wr/AsyncImagePipelineManager.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/wr/AsyncImagePipelineManager.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -381,7 +381,7 @@
   params.mix_blend_mode = aPipeline->mMixBlendMode;
 
   Maybe<wr::WrSpatialId> referenceFrameId = builder.PushStackingContext(
-      params, wr::ToRoundedLayoutRect(aPipeline->mScBounds),
+      params, wr::ToLayoutRect(aPipeline->mScBounds),
       // This is fine to do unconditionally because we only push images here.
       wr::RasterSpace::Screen());
 
@@ -402,14 +402,13 @@
       MOZ_ASSERT(aPipeline->mCurrentTexture->AsWebRenderTextureHost());
       Range<wr::ImageKey> range_keys(&keys[0], keys.Length());
       aPipeline->mCurrentTexture->PushDisplayItems(
-          builder, wr::ToRoundedLayoutRect(rect), wr::ToRoundedLayoutRect(rect),
+          builder, wr::ToLayoutRect(rect), wr::ToLayoutRect(rect),
           aPipeline->mFilter, range_keys);
       HoldExternalImage(aPipelineId, aEpoch, aPipeline->mCurrentTexture);
     } else {
       MOZ_ASSERT(keys.Length() == 1);
-      builder.PushImage(wr::ToRoundedLayoutRect(rect),
-                        wr::ToRoundedLayoutRect(rect), true, aPipeline->mFilter,
-                        keys[0]);
+      builder.PushImage(wr::ToLayoutRect(rect), wr::ToLayoutRect(rect), true,
+                        aPipeline->mFilter, keys[0]);
     }
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/wr/ClipManager.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/wr/ClipManager.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/wr/ClipManager.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/wr/ClipManager.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -304,8 +304,8 @@
   LayoutDevicePoint scrollOffset =
       metrics.GetScrollOffset() * metrics.GetDevPixelsPerCSSPixel();
   return Some(mBuilder->DefineScrollLayer(
-      viewId, parent, wr::ToRoundedLayoutRect(contentRect),
-      wr::ToRoundedLayoutRect(clipBounds), wr::ToLayoutPoint(scrollOffset)));
+      viewId, parent, wr::ToLayoutRect(contentRect),
+      wr::ToLayoutRect(clipBounds), wr::ToLayoutPoint(scrollOffset)));
 }
 
 Maybe<wr::WrClipChainId> ClipManager::DefineClipChain(
@@ -342,7 +342,7 @@
     // Define the clip
     spaceAndClip->space = SpatialIdAfterOverride(spaceAndClip->space);
     wr::WrClipId clipId = mBuilder->DefineClip(
-        spaceAndClip, wr::ToRoundedLayoutRect(clip), &wrRoundedRects);
+        spaceAndClip, wr::ToLayoutRect(clip), &wrRoundedRects);
     clipIds.AppendElement(clipId);
     cache[chain] = clipId;
     CLIP_LOG("cache[%p] <= %zu\n", chain, clipId.id);
@@ -373,7 +373,7 @@
   Maybe<wr::LayoutRect> clipLeaf;
   if (mSeparateLeaf) {
     MOZ_ASSERT(mChain);
-    clipLeaf.emplace(wr::ToRoundedLayoutRect(LayoutDeviceRect::FromAppUnits(
+    clipLeaf.emplace(wr::ToLayoutRect(LayoutDeviceRect::FromAppUnits(
         mChain->mClip.GetClipRect(), aAppUnitsPerDevPixel)));
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/wr/WebRenderCommandBuilder.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/wr/WebRenderCommandBuilder.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/wr/WebRenderCommandBuilder.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/wr/WebRenderCommandBuilder.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -1927,8 +1927,8 @@
     return false;
   }
 
-  auto r = wr::ToRoundedLayoutRect(aRect);
-  auto c = wr::ToRoundedLayoutRect(aClip);
+  auto r = wr::ToLayoutRect(aRect);
+  auto c = wr::ToLayoutRect(aClip);
   aBuilder.PushImage(r, c, !aItem->BackfaceIsHidden(), rendering, key.value());
 
   return true;
@@ -2563,7 +2563,7 @@
     return false;
   }
 
-  wr::LayoutRect dest = wr::ToRoundedLayoutRect(imageRect);
+  wr::LayoutRect dest = wr::ToLayoutRect(imageRect);
   gfx::SamplingFilter sampleFilter =
       nsLayoutUtils::GetSamplingFilterForFrame(aItem->Frame());
   aBuilder.PushImage(dest, dest, !aItem->BackfaceIsHidden(),
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/wr/WebRenderLayerManager.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/wr/WebRenderLayerManager.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/wr/WebRenderLayerManager.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/wr/WebRenderLayerManager.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -315,7 +315,7 @@
                                renderRoot == wr::RenderRoot::Default
                                    ? LayoutDeviceSize(size)
                                    : LayoutDeviceSize());
-    wrRects[renderRoot] = wr::ToRoundedLayoutRect(rects[renderRoot]);
+    wrRects[renderRoot] = wr::ToLayoutRect(rects[renderRoot]);
   }
 
   wr::DisplayListBuilder builder(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/wr/WebRenderUserData.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/wr/WebRenderUserData.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/layers/wr/WebRenderUserData.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/layers/wr/WebRenderUserData.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -263,7 +263,7 @@
   // context need to be done manually and pushed over to the parent side,
   // where it will be done when we build the display list for the iframe.
   // That happens in AsyncImagePipelineManager.
-  wr::LayoutRect r = wr::ToRoundedLayoutRect(aBounds);
+  wr::LayoutRect r = wr::ToLayoutRect(aBounds);
   aBuilder.PushIFrame(r, aIsBackfaceVisible, mPipelineId.ref(),
                       /*ignoreMissingPipelines*/ false);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/skia/skia/include/config/SkUserConfig.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/skia/skia/include/config/SkUserConfig.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/skia/skia/include/config/SkUserConfig.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/skia/skia/include/config/SkUserConfig.h	2019-09-15 11:33:10.000000000 +0000
@@ -157,4 +157,6 @@
 
 #define I_ACKNOWLEDGE_SKIA_DOES_NOT_SUPPORT_BIG_ENDIAN
 
+#define SK_USE_FREETYPE_EMBOLDEN
+
 #endif
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/skia/skia/include/ports/SkTypeface_cairo.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/skia/skia/include/ports/SkTypeface_cairo.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/skia/skia/include/ports/SkTypeface_cairo.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/skia/skia/include/ports/SkTypeface_cairo.h	2019-09-15 11:33:11.000000000 +0000
@@ -1,18 +1,18 @@
 #ifndef SkTypeface_cairo_DEFINED
 #define SkTypeface_cairo_DEFINED
 
-#include <cairo.h>
-#include <cairo-ft.h>
-
 #include "SkTypeface.h"
+#include "SkSurfaceProps.h"
 
-SK_API extern void SkInitCairoFT(bool fontHintingEnabled);
+struct FT_FaceRec_;
+typedef FT_FaceRec_* FT_Face;
 
-SK_API extern SkTypeface* SkCreateTypefaceFromCairoFTFont(cairo_scaled_font_t* scaledFont, FT_Face face = nullptr);
+SK_API extern void SkInitCairoFT(bool fontHintingEnabled);
 
-#ifdef CAIRO_HAS_FC_FONT
-SK_API extern SkTypeface* SkCreateTypefaceFromCairoFTFontWithFontconfig(cairo_scaled_font_t* scaledFont, FcPattern* pattern, FT_Face face = nullptr);
-#endif
+SK_API extern SkTypeface* SkCreateTypefaceFromCairoFTFont(
+    FT_Face face = nullptr, void* faceContext = nullptr,
+    SkPixelGeometry pixelGeometry = kUnknown_SkPixelGeometry,
+    uint8_t lcdFilter = 0);
 
 #endif
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/skia/skia/src/ports/SkFontHost_cairo.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -6,9 +6,6 @@
  * found in the LICENSE file.
  */
 
-#include "cairo.h"
-#include "cairo-ft.h"
-
 #include "SkFontHost_FreeType_common.h"
 
 #include "SkAdvancedTypefaceMetrics.h"
@@ -67,6 +64,10 @@
 {
     void mozilla_LockFTLibrary(FT_Library aLibrary);
     void mozilla_UnlockFTLibrary(FT_Library aLibrary);
+    void mozilla_AddRefSharedFTFace(void* aContext);
+    void mozilla_ReleaseSharedFTFace(void* aContext);
+    int mozilla_LockSharedFTFace(void* aContext, void* aOwner);
+    void mozilla_UnlockSharedFTFace(void* aContext);
     FT_Error mozilla_LoadFTGlyph(FT_Face aFace, uint32_t aGlyphIndex, int32_t aFlags);
 }
 
@@ -88,20 +89,27 @@
     }
 }
 
-#ifndef CAIRO_HAS_FC_FONT
-typedef struct _FcPattern FcPattern;
-#endif
-
 class SkScalerContext_CairoFT : public SkScalerContext_FreeType_Base {
 public:
-    SkScalerContext_CairoFT(sk_sp<SkTypeface> typeface, const SkScalerContextEffects& effects, const SkDescriptor* desc,
-                            cairo_font_face_t* fontFace, FcPattern* pattern);
+    SkScalerContext_CairoFT(sk_sp<SkTypeface> typeface,
+                            const SkScalerContextEffects& effects,
+                            const SkDescriptor* desc, FT_Face face,
+                            void* faceContext, SkPixelGeometry pixelGeometry,
+                            FT_LcdFilter lcdFilter);
     virtual ~SkScalerContext_CairoFT();
 
-    bool isValid() const {
-        return fScaledFont != nullptr;
+    bool isValid() const { return fFTFaceContext != nullptr; }
+
+    void Lock() {
+        if (!mozilla_LockSharedFTFace(fFTFaceContext, this)) {
+            FT_Set_Transform(fFTFace, fHaveShape ? &fShapeMatrixFT : nullptr, nullptr);
+            FT_Set_Char_Size(fFTFace, FT_F26Dot6(fScaleX * 64.0f + 0.5f),
+                             FT_F26Dot6(fScaleY * 64.0f + 0.5f), 0, 0);
+        }
     }
 
+    void Unlock() { mozilla_UnlockSharedFTFace(fFTFaceContext); }
+
 protected:
     virtual unsigned generateGlyphCount() override;
     virtual uint16_t generateCharToGlyph(SkUnichar uniChar) override;
@@ -115,11 +123,8 @@
     bool computeShapeMatrix(const SkMatrix& m);
     void prepareGlyph(FT_GlyphSlot glyph);
 
-#ifdef CAIRO_HAS_FC_FONT
-    void parsePattern(FcPattern* pattern);
-#endif
-
-    cairo_scaled_font_t* fScaledFont;
+    FT_Face fFTFace;
+    void* fFTFaceContext;
     FT_Int32 fLoadGlyphFlags;
     FT_LcdFilter fLcdFilter;
     SkScalar fScaleX;
@@ -129,26 +134,17 @@
     bool fHaveShape;
 };
 
-class CairoLockedFTFace {
+class AutoLockFTFace {
 public:
-    CairoLockedFTFace(cairo_scaled_font_t* scaledFont)
-        : fScaledFont(scaledFont)
-        , fFace(cairo_ft_scaled_font_lock_face(scaledFont))
-    {}
-
-    ~CairoLockedFTFace()
-    {
-        cairo_ft_scaled_font_unlock_face(fScaledFont);
+    AutoLockFTFace(SkScalerContext_CairoFT* scalerContext)
+        : fScalerContext(scalerContext) {
+        fScalerContext->Lock();
     }
 
-    FT_Face getFace()
-    {
-        return fFace;
-    }
+    ~AutoLockFTFace() { fScalerContext->Unlock(); }
 
 private:
-    cairo_scaled_font_t* fScaledFont;
-    FT_Face fFace;
+    SkScalerContext_CairoFT* fScalerContext;
 };
 
 template<typename T> static bool isLCD(const T& rec) {
@@ -178,9 +174,9 @@
 
     virtual SkScalerContext* onCreateScalerContext(const SkScalerContextEffects& effects, const SkDescriptor* desc) const override
     {
-        SkScalerContext_CairoFT* ctx =
-            new SkScalerContext_CairoFT(sk_ref_sp(const_cast<SkCairoFTTypeface*>(this)),
-                                        effects, desc, fFontFace, fPattern);
+        SkScalerContext_CairoFT* ctx = new SkScalerContext_CairoFT(
+            sk_ref_sp(const_cast<SkCairoFTTypeface*>(this)), effects, desc,
+            fFTFace, fFTFaceContext, fPixelGeometry, fLcdFilter);
         if (!ctx->isValid()) {
             delete ctx;
             return nullptr;
@@ -190,11 +186,6 @@
 
     virtual void onFilterRec(SkScalerContextRec* rec) const override
     {
-        // No subpixel AA unless enabled in Fontconfig.
-        if (!fPattern && isLCD(*rec)) {
-            rec->fMaskFormat = SkMask::kA8_Format;
-        }
-
         // rotated text looks bad with hinting, so we disable it as needed
         if (!gFontHintingEnabled || !isAxisAligned(*rec)) {
             rec->setHinting(kNo_SkFontHinting);
@@ -251,21 +242,18 @@
         return 0;
     }
 
-    SkCairoFTTypeface(cairo_font_face_t* fontFace, FcPattern* pattern, FT_Face face)
+    SkCairoFTTypeface(FT_Face face, void* faceContext,
+                      SkPixelGeometry pixelGeometry, FT_LcdFilter lcdFilter)
         : SkTypeface(SkFontStyle::Normal())
-        , fFontFace(fontFace)
-        , fPattern(pattern)
         , fFTFace(face)
+        , fFTFaceContext(faceContext)
+        , fPixelGeometry(pixelGeometry)
+        , fLcdFilter(lcdFilter)
     {
-        cairo_font_face_reference(fFontFace);
-#ifdef CAIRO_HAS_FC_FONT
-        if (fPattern) {
-            FcPatternReference(fPattern);
-        }
-#endif
+        mozilla_AddRefSharedFTFace(fFTFaceContext);
     }
 
-    cairo_font_face_t* GetCairoFontFace() const { return fFontFace; }
+    void* GetFTFaceContext() const { return fFTFaceContext; }
 
     virtual bool hasColorGlyphs() const override
     {
@@ -275,84 +263,54 @@
         if (fFTFace) {
             return !FT_IS_SCALABLE(fFTFace);
         }
-#ifdef CAIRO_HAS_FC_FONT
-        if (fPattern) {
-            FcBool outline;
-            if (FcPatternGetBool(fPattern, FC_OUTLINE, 0, &outline) != FcResultMatch ||
-                !outline) {
-                return true;
-            }
-        }
-#endif
         return false;
     }
 
 private:
     ~SkCairoFTTypeface()
     {
-        cairo_font_face_destroy(fFontFace);
-#ifdef CAIRO_HAS_FC_FONT
-        if (fPattern) {
-            FcPatternDestroy(fPattern);
-        }
-#endif
+        mozilla_ReleaseSharedFTFace(fFTFaceContext);
     }
 
-    cairo_font_face_t* fFontFace;
-    FcPattern* fPattern;
-    FT_Face    fFTFace;
+    FT_Face            fFTFace;
+    void*              fFTFaceContext;
+    SkPixelGeometry    fPixelGeometry;
+    FT_LcdFilter       fLcdFilter;
 };
 
-static bool FindByCairoFontFace(SkTypeface* typeface, void* context) {
-    return static_cast<SkCairoFTTypeface*>(typeface)->GetCairoFontFace() == static_cast<cairo_font_face_t*>(context);
+static bool FindByFTFaceContext(SkTypeface* typeface, void* context) {
+    return static_cast<SkCairoFTTypeface*>(typeface)->GetFTFaceContext() == context;
 }
 
-SkTypeface* SkCreateTypefaceFromCairoFTFontWithFontconfig(cairo_scaled_font_t* scaledFont, FcPattern* pattern, FT_Face face)
+SkTypeface* SkCreateTypefaceFromCairoFTFont(FT_Face face, void* faceContext,
+                                            SkPixelGeometry pixelGeometry,
+                                            uint8_t lcdFilter)
 {
-    cairo_font_face_t* fontFace = cairo_scaled_font_get_font_face(scaledFont);
-    SkASSERT(cairo_font_face_status(fontFace) == CAIRO_STATUS_SUCCESS);
-    SkASSERT(cairo_font_face_get_type(fontFace) == CAIRO_FONT_TYPE_FT);
-
-    sk_sp<SkTypeface> typeface = SkTypefaceCache::FindByProcAndRef(FindByCairoFontFace, fontFace);
+    sk_sp<SkTypeface> typeface =
+        SkTypefaceCache::FindByProcAndRef(FindByFTFaceContext, faceContext);
     if (!typeface) {
-        typeface = sk_make_sp<SkCairoFTTypeface>(fontFace, pattern, face);
+        typeface = sk_make_sp<SkCairoFTTypeface>(face, faceContext, pixelGeometry,
+                                                 (FT_LcdFilter)lcdFilter);
         SkTypefaceCache::Add(typeface);
     }
 
     return typeface.release();
 }
 
-SkTypeface* SkCreateTypefaceFromCairoFTFont(cairo_scaled_font_t* scaledFont, FT_Face face)
-{
-    return SkCreateTypefaceFromCairoFTFontWithFontconfig(scaledFont, nullptr, face);
-}
-
-SkScalerContext_CairoFT::SkScalerContext_CairoFT(sk_sp<SkTypeface> typeface, const SkScalerContextEffects& effects, const SkDescriptor* desc,
-                                                 cairo_font_face_t* fontFace, FcPattern* pattern)
+SkScalerContext_CairoFT::SkScalerContext_CairoFT(
+    sk_sp<SkTypeface> typeface, const SkScalerContextEffects& effects,
+    const SkDescriptor* desc, FT_Face face, void* faceContext,
+    SkPixelGeometry pixelGeometry, FT_LcdFilter lcdFilter)
     : SkScalerContext_FreeType_Base(std::move(typeface), effects, desc)
-    , fLcdFilter(FT_LCD_FILTER_NONE)
+    , fFTFace(face)
+    , fFTFaceContext(faceContext)
+    , fLcdFilter(lcdFilter)
 {
     SkMatrix matrix;
     fRec.getSingleMatrix(&matrix);
 
-    cairo_matrix_t fontMatrix, ctMatrix;
-    cairo_matrix_init(&fontMatrix, matrix.getScaleX(), matrix.getSkewY(), matrix.getSkewX(), matrix.getScaleY(), 0.0, 0.0);
-    cairo_matrix_init_identity(&ctMatrix);
-
-    cairo_font_options_t *fontOptions = cairo_font_options_create();
-    fScaledFont = cairo_scaled_font_create(fontFace, &fontMatrix, &ctMatrix, fontOptions);
-    cairo_font_options_destroy(fontOptions);
-
     computeShapeMatrix(matrix);
 
-    fRec.fFlags |= SkScalerContext::kEmbeddedBitmapText_Flag;
-
-#ifdef CAIRO_HAS_FC_FONT
-    if (pattern) {
-        parsePattern(pattern);
-    }
-#endif
-
     FT_Int32 loadFlags = FT_LOAD_DEFAULT;
 
     if (SkMask::kBW_Format == fRec.fMaskFormat) {
@@ -363,6 +321,24 @@
         }
         loadFlags |= FT_LOAD_MONOCHROME;
     } else {
+        if (isLCD(fRec)) {
+            switch (pixelGeometry) {
+            case kRGB_H_SkPixelGeometry:
+            default:
+                break;
+            case kRGB_V_SkPixelGeometry:
+                fRec.fFlags |= SkScalerContext::kLCD_Vertical_Flag;
+                break;
+            case kBGR_H_SkPixelGeometry:
+                fRec.fFlags |= SkScalerContext::kLCD_BGROrder_Flag;
+                break;
+            case kBGR_V_SkPixelGeometry:
+                fRec.fFlags |= SkScalerContext::kLCD_Vertical_Flag |
+                               SkScalerContext::kLCD_BGROrder_Flag;
+                break;
+            }
+        }
+
         switch (fRec.getHinting()) {
         case kNo_SkFontHinting:
             loadFlags |= FT_LOAD_NO_HINTING;
@@ -395,9 +371,7 @@
 
     // Disable autohinting when asked to disable hinting, except for "tricky" fonts.
     if (!gFontHintingEnabled) {
-        CairoLockedFTFace faceLock(fScaledFont);
-        FT_Face face = faceLock.getFace();
-        if (face && !(face->face_flags & FT_FACE_FLAG_TRICKY)) {
+        if (fFTFace && !(fFTFace->face_flags & FT_FACE_FLAG_TRICKY)) {
             loadFlags |= FT_LOAD_NO_AUTOHINT;
         }
     }
@@ -418,108 +392,8 @@
 
 SkScalerContext_CairoFT::~SkScalerContext_CairoFT()
 {
-    cairo_scaled_font_destroy(fScaledFont);
 }
 
-#ifdef CAIRO_HAS_FC_FONT
-void SkScalerContext_CairoFT::parsePattern(FcPattern* pattern)
-{
-    FcBool antialias, autohint, bitmap, embolden, hinting;
-
-    if (FcPatternGetBool(pattern, FC_AUTOHINT, 0, &autohint) == FcResultMatch && autohint) {
-        fRec.fFlags |= SkScalerContext::kForceAutohinting_Flag;
-    }
-    if (FcPatternGetBool(pattern, FC_EMBOLDEN, 0, &embolden) == FcResultMatch && embolden) {
-        fRec.fFlags |= SkScalerContext::kEmbolden_Flag;
-    }
-
-    // Match cairo-ft's handling of embeddedbitmap:
-    // If AA is explicitly disabled, leave bitmaps enabled.
-    // Otherwise, disable embedded bitmaps unless explicitly enabled.
-    if (FcPatternGetBool(pattern, FC_ANTIALIAS, 0, &antialias) == FcResultMatch && !antialias) {
-        fRec.fMaskFormat = SkMask::kBW_Format;
-    } else if (FcPatternGetBool(pattern, FC_EMBEDDED_BITMAP, 0, &bitmap) != FcResultMatch || !bitmap) {
-        fRec.fFlags &= ~SkScalerContext::kEmbeddedBitmapText_Flag;
-    }
-
-    if (fRec.fMaskFormat != SkMask::kBW_Format) {
-        int rgba;
-        if (!isLCD(fRec) ||
-            FcPatternGetInteger(pattern, FC_RGBA, 0, &rgba) != FcResultMatch) {
-            rgba = FC_RGBA_UNKNOWN;
-        }
-        switch (rgba) {
-        case FC_RGBA_RGB:
-            break;
-        case FC_RGBA_BGR:
-            fRec.fFlags |= SkScalerContext::kLCD_BGROrder_Flag;
-            break;
-        case FC_RGBA_VRGB:
-            fRec.fFlags |= SkScalerContext::kLCD_Vertical_Flag;
-            break;
-        case FC_RGBA_VBGR:
-            fRec.fFlags |= SkScalerContext::kLCD_Vertical_Flag |
-                           SkScalerContext::kLCD_BGROrder_Flag;
-            break;
-        default:
-            fRec.fMaskFormat = SkMask::kA8_Format;
-            break;
-        }
-
-        int filter;
-        if (isLCD(fRec)) {
-            if (FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &filter) != FcResultMatch) {
-                filter = FC_LCD_LEGACY;
-            }
-            switch (filter) {
-            case FC_LCD_NONE:
-                fLcdFilter = FT_LCD_FILTER_NONE;
-                break;
-            case FC_LCD_DEFAULT:
-                fLcdFilter = FT_LCD_FILTER_DEFAULT;
-                break;
-            case FC_LCD_LIGHT:
-                fLcdFilter = FT_LCD_FILTER_LIGHT;
-                break;
-            case FC_LCD_LEGACY:
-            default:
-                fLcdFilter = FT_LCD_FILTER_LEGACY;
-                break;
-            }
-        }
-    }
-
-    if (fRec.getHinting() != kNo_SkFontHinting) {
-        // Hinting was requested, so check if the fontconfig pattern needs to override it.
-        // If hinting is either explicitly enabled by fontconfig or not configured, try to
-        // parse the hint style. Otherwise, ensure hinting is disabled.
-        int hintstyle;
-        if (FcPatternGetBool(pattern, FC_HINTING, 0, &hinting) != FcResultMatch || hinting) {
-            if (FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &hintstyle) != FcResultMatch) {
-                hintstyle = FC_HINT_FULL;
-            }
-        } else {
-            hintstyle = FC_HINT_NONE;
-        }
-        switch (hintstyle) {
-        case FC_HINT_NONE:
-            fRec.setHinting(kNo_SkFontHinting);
-            break;
-        case FC_HINT_SLIGHT:
-            fRec.setHinting(kSlight_SkFontHinting);
-            break;
-        case FC_HINT_MEDIUM:
-        default:
-            fRec.setHinting(kNormal_SkFontHinting);
-            break;
-        case FC_HINT_FULL:
-            fRec.setHinting(kFull_SkFontHinting);
-            break;
-        }
-    }
-}
-#endif
-
 bool SkScalerContext_CairoFT::computeShapeMatrix(const SkMatrix& m)
 {
     // Compute a shape matrix compatible with Cairo's _compute_transform.
@@ -542,16 +416,14 @@
     minor = SkTMax(minor, 1.0);
 
     // If the font is not scalable, then choose the best available size.
-    CairoLockedFTFace faceLock(fScaledFont);
-    FT_Face face = faceLock.getFace();
-    if (face && !FT_IS_SCALABLE(face)) {
+    if (fFTFace && !FT_IS_SCALABLE(fFTFace)) {
         double bestDist = DBL_MAX;
         FT_Int bestSize = -1;
-        for (FT_Int i = 0; i < face->num_fixed_sizes; i++) {
+        for (FT_Int i = 0; i < fFTFace->num_fixed_sizes; i++) {
             // Distance is positive if strike is larger than desired size,
             // or negative if smaller. If previously a found smaller strike,
             // then prefer a larger strike. Otherwise, minimize distance.
-            double dist = face->available_sizes[i].y_ppem / 64.0 - minor;
+            double dist = fFTFace->available_sizes[i].y_ppem / 64.0 - minor;
             if (bestDist < 0 ? dist >= bestDist : fabs(dist) <= bestDist) {
                 bestDist = dist;
                 bestSize = i;
@@ -563,11 +435,11 @@
             fHaveShape = false;
             return false;
         }
-        major = face->available_sizes[bestSize].x_ppem / 64.0;
-        minor = face->available_sizes[bestSize].y_ppem / 64.0;
+        major = fFTFace->available_sizes[bestSize].x_ppem / 64.0;
+        minor = fFTFace->available_sizes[bestSize].y_ppem / 64.0;
         fHaveShape = true;
     } else {
-        fHaveShape = !m.isScaleTranslate();
+        fHaveShape = !m.isScaleTranslate() || scaleX < 0.0 || scaleY < 0.0;
     }
 
     fScaleX = SkDoubleToScalar(major);
@@ -588,14 +460,13 @@
 
 unsigned SkScalerContext_CairoFT::generateGlyphCount()
 {
-    CairoLockedFTFace faceLock(fScaledFont);
-    return faceLock.getFace()->num_glyphs;
+    return fFTFace->num_glyphs;
 }
 
 uint16_t SkScalerContext_CairoFT::generateCharToGlyph(SkUnichar uniChar)
 {
-    CairoLockedFTFace faceLock(fScaledFont);
-    return SkToU16(FT_Get_Char_Index(faceLock.getFace(), uniChar));
+    AutoLockFTFace faceLock(this);
+    return SkToU16(FT_Get_Char_Index(fFTFace, uniChar));
 }
 
 bool SkScalerContext_CairoFT::generateAdvance(SkGlyph* glyph)
@@ -614,34 +485,31 @@
 
 void SkScalerContext_CairoFT::generateMetrics(SkGlyph* glyph)
 {
-    SkASSERT(fScaledFont != nullptr);
-
     glyph->fMaskFormat = fRec.fMaskFormat;
 
     glyph->zeroMetrics();
 
-    CairoLockedFTFace faceLock(fScaledFont);
-    FT_Face face = faceLock.getFace();
+    AutoLockFTFace faceLock(this);
 
-    FT_Error err = mozilla_LoadFTGlyph( face, glyph->getGlyphID(), fLoadGlyphFlags );
+    FT_Error err = mozilla_LoadFTGlyph(fFTFace, glyph->getGlyphID(), fLoadGlyphFlags);
     if (err != 0) {
         return;
     }
 
-    prepareGlyph(face->glyph);
+    prepareGlyph(fFTFace->glyph);
 
-    glyph->fAdvanceX = SkFDot6ToFloat(face->glyph->advance.x);
-    glyph->fAdvanceY = -SkFDot6ToFloat(face->glyph->advance.y);
+    glyph->fAdvanceX = SkFDot6ToFloat(fFTFace->glyph->advance.x);
+    glyph->fAdvanceY = -SkFDot6ToFloat(fFTFace->glyph->advance.y);
 
     SkIRect bounds;
-    switch (face->glyph->format) {
+    switch (fFTFace->glyph->format) {
     case FT_GLYPH_FORMAT_OUTLINE:
-        if (!face->glyph->outline.n_contours) {
+        if (!fFTFace->glyph->outline.n_contours) {
             return;
         }
 
         FT_BBox bbox;
-        FT_Outline_Get_CBox(&face->glyph->outline, &bbox);
+        FT_Outline_Get_CBox(&fFTFace->glyph->outline, &bbox);
         bbox.xMin &= ~63;
         bbox.yMin &= ~63;
         bbox.xMax = (bbox.xMax + 63) & ~63;
@@ -668,7 +536,7 @@
         }
         break;
     case FT_GLYPH_FORMAT_BITMAP:
-        if (face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA) {
+        if (fFTFace->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_BGRA) {
             glyph->fMaskFormat = SkMask::kARGB32_Format;
         }
 
@@ -685,10 +553,10 @@
 
             // Apply the shape matrix to the glyph's bounding box.
             SkRect srcRect = SkRect::MakeXYWH(
-                SkIntToScalar(face->glyph->bitmap_left),
-                -SkIntToScalar(face->glyph->bitmap_top),
-                SkIntToScalar(face->glyph->bitmap.width),
-                SkIntToScalar(face->glyph->bitmap.rows));
+                SkIntToScalar(fFTFace->glyph->bitmap_left),
+                -SkIntToScalar(fFTFace->glyph->bitmap_top),
+                SkIntToScalar(fFTFace->glyph->bitmap.width),
+                SkIntToScalar(fFTFace->glyph->bitmap.rows));
             SkRect destRect;
             fShapeMatrix.mapRect(&destRect, srcRect);
             SkIRect glyphRect = destRect.roundOut();
@@ -697,10 +565,10 @@
                                        glyphRect.width(),
                                        glyphRect.height());
         } else {
-            bounds = SkIRect::MakeXYWH(face->glyph->bitmap_left,
-                                       -face->glyph->bitmap_top,
-                                       face->glyph->bitmap.width,
-                                       face->glyph->bitmap.rows);
+            bounds = SkIRect::MakeXYWH(fFTFace->glyph->bitmap_left,
+                                       -fFTFace->glyph->bitmap_top,
+                                       fFTFace->glyph->bitmap.width,
+                                       fFTFace->glyph->bitmap.rows);
         }
         break;
     default:
@@ -718,48 +586,44 @@
 
 void SkScalerContext_CairoFT::generateImage(const SkGlyph& glyph)
 {
-    SkASSERT(fScaledFont != nullptr);
-    CairoLockedFTFace faceLock(fScaledFont);
-    FT_Face face = faceLock.getFace();
+    AutoLockFTFace faceLock(this);
 
-    FT_Error err = mozilla_LoadFTGlyph(face, glyph.getGlyphID(), fLoadGlyphFlags);
+    FT_Error err = mozilla_LoadFTGlyph(fFTFace, glyph.getGlyphID(), fLoadGlyphFlags);
 
     if (err != 0) {
         memset(glyph.fImage, 0, glyph.rowBytes() * glyph.fHeight);
         return;
     }
 
-    prepareGlyph(face->glyph);
+    prepareGlyph(fFTFace->glyph);
 
     bool useLcdFilter =
-        face->glyph->format == FT_GLYPH_FORMAT_OUTLINE &&
+        fFTFace->glyph->format == FT_GLYPH_FORMAT_OUTLINE &&
         isLCD(glyph) &&
         gSetLcdFilter;
     if (useLcdFilter) {
-        mozilla_LockFTLibrary(face->glyph->library);
-        gSetLcdFilter(face->glyph->library, fLcdFilter);
+        mozilla_LockFTLibrary(fFTFace->glyph->library);
+        gSetLcdFilter(fFTFace->glyph->library, fLcdFilter);
     }
 
     SkMatrix matrix;
-    if (face->glyph->format == FT_GLYPH_FORMAT_BITMAP &&
+    if (fFTFace->glyph->format == FT_GLYPH_FORMAT_BITMAP &&
         fHaveShape) {
         matrix = fShapeMatrix;
     } else {
         matrix.setIdentity();
     }
-    generateGlyphImage(face, glyph, matrix);
+    generateGlyphImage(fFTFace, glyph, matrix);
 
     if (useLcdFilter) {
-        gSetLcdFilter(face->glyph->library, FT_LCD_FILTER_NONE);
-        mozilla_UnlockFTLibrary(face->glyph->library);
+        gSetLcdFilter(fFTFace->glyph->library, FT_LCD_FILTER_NONE);
+        mozilla_UnlockFTLibrary(fFTFace->glyph->library);
     }
 }
 
 bool SkScalerContext_CairoFT::generatePath(SkGlyphID glyphID, SkPath* path)
 {
-    SkASSERT(fScaledFont != nullptr);
-    CairoLockedFTFace faceLock(fScaledFont);
-    FT_Face face = faceLock.getFace();
+    AutoLockFTFace faceLock(this);
 
     SkASSERT(path);
 
@@ -767,16 +631,16 @@
     flags |= FT_LOAD_NO_BITMAP; // ignore embedded bitmaps so we're sure to get the outline
     flags &= ~FT_LOAD_RENDER;   // don't scan convert (we just want the outline)
 
-    FT_Error err = mozilla_LoadFTGlyph(face, glyphID, flags);
+    FT_Error err = mozilla_LoadFTGlyph(fFTFace, glyphID, flags);
 
     if (err != 0) {
         path->reset();
         return false;
     }
 
-    prepareGlyph(face->glyph);
+    prepareGlyph(fFTFace->glyph);
 
-    return generateGlyphPath(face, path);
+    return generateGlyphPath(fFTFace, path);
 }
 
 void SkScalerContext_CairoFT::generateFontMetrics(SkFontMetrics* metrics)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/tests/reftest/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/gfx/tests/reftest/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/tests/reftest/reftest.list	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/tests/reftest/reftest.list	2019-09-15 11:33:11.000000000 +0000
@@ -14,7 +14,7 @@
 == 1444904.html 1444904-ref.html
 == 1451168.html 1451168-ref.html
 == 1461313.html 1461313-ref.html
-fuzzy(5-32,21908-26621) fuzzy-if(webrender,0-9,0-100) == 1463802.html 1463802-ref.html
+fuzzy(5-32,21908-26621) fuzzy-if(webrender,5-5,868-1039) == 1463802.html 1463802-ref.html
 fuzzy(0-11,0-4) == 1474722.html 1474722-ref.html
 == 1501195.html 1501195-ref.html
 == 1519754.html 1519754-ref.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxAndroidPlatform.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxAndroidPlatform.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxAndroidPlatform.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxAndroidPlatform.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -246,8 +246,6 @@
                           aDevToCssSize);
 }
 
-FT_Library gfxAndroidPlatform::GetFTLibrary() { return gPlatformFTLibrary; }
-
 bool gfxAndroidPlatform::FontHintingEnabled() {
   // In "mobile" builds, we sometimes use non-reflow-zoom, so we
   // might not want hinting.  Let's see.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxAndroidPlatform.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxAndroidPlatform.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxAndroidPlatform.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxAndroidPlatform.h	2019-09-15 11:33:10.000000000 +0000
@@ -50,8 +50,6 @@
   bool FontHintingEnabled() override;
   bool RequiresLinearZoom() override;
 
-  FT_Library GetFTLibrary() override;
-
   already_AddRefed<mozilla::gfx::VsyncSource> CreateHardwareVsyncSource()
       override;
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxDWriteFontList.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxDWriteFontList.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxDWriteFontList.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxDWriteFontList.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -633,12 +633,12 @@
   RefPtr<UnscaledFontDWrite> unscaledFont(unscaledFontPtr);
   if (!unscaledFont) {
     RefPtr<IDWriteFontFace> fontFace;
-    nsresult rv = CreateFontFace(getter_AddRefs(fontFace), aFontStyle, sims);
+    nsresult rv = CreateFontFace(getter_AddRefs(fontFace), nullptr, sims);
     if (NS_FAILED(rv)) {
       return nullptr;
     }
     unscaledFont =
-        new UnscaledFontDWrite(fontFace, mIsSystemFont ? mFont : nullptr, sims);
+        new UnscaledFontDWrite(fontFace, mIsSystemFont ? mFont : nullptr);
     unscaledFontPtr = unscaledFont;
   }
   RefPtr<IDWriteFontFace> fontFace;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxDWriteFonts.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxDWriteFonts.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxDWriteFonts.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxDWriteFonts.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -471,17 +471,6 @@
 
 uint32_t gfxDWriteFont::GetSpaceGlyph() { return mSpaceGlyph; }
 
-bool gfxDWriteFont::SetupCairoFont(DrawTarget* aDrawTarget) {
-  cairo_scaled_font_t* scaledFont = InitCairoScaledFont();
-  if (cairo_scaled_font_status(scaledFont) != CAIRO_STATUS_SUCCESS) {
-    // Don't cairo_set_scaled_font as that would propagate the error to
-    // the cairo_t, precluding any further drawing.
-    return false;
-  }
-  cairo_set_scaled_font(gfxFont::RefCairo(aDrawTarget), scaledFont);
-  return true;
-}
-
 bool gfxDWriteFont::IsValid() const { return mFontFace != nullptr; }
 
 IDWriteFontFace* gfxDWriteFont::GetFontFace() { return mFontFace.get(); }
@@ -578,7 +567,7 @@
   return width;
 }
 
-bool gfxDWriteFont::GetForceGDIClassic() {
+bool gfxDWriteFont::GetForceGDIClassic() const {
   return static_cast<gfxDWriteFontEntry*>(mFontEntry.get())
              ->GetForceGDIClassic() &&
          cairo_dwrite_get_cleartype_rendering_mode() < 0 &&
@@ -587,7 +576,7 @@
 }
 
 DWRITE_MEASURING_MODE
-gfxDWriteFont::GetMeasuringMode() {
+gfxDWriteFont::GetMeasuringMode() const {
   return GetForceGDIClassic()
              ? DWRITE_MEASURING_MODE_GDI_CLASSIC
              : gfxWindowsPlatform::GetPlatform()->DWriteMeasuringMode();
@@ -701,3 +690,12 @@
   RefPtr<ScaledFont> scaledFont(mAzureScaledFont);
   return scaledFont.forget();
 }
+
+bool gfxDWriteFont::ShouldRoundXOffset(cairo_t* aCairo) const {
+  // show_glyphs is implemented on the font and so is used for all Cairo
+  // surface types; however, it may pixel-snap depending on the dwrite
+  // rendering mode
+  return GetForceGDIClassic() ||
+         gfxWindowsPlatform::GetPlatform()->DWriteMeasuringMode() !=
+             DWRITE_MEASURING_MODE_NATURAL;
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxDWriteFonts.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxDWriteFonts.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxDWriteFonts.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxDWriteFonts.h	2019-09-15 11:33:10.000000000 +0000
@@ -40,8 +40,6 @@
 
   uint32_t GetSpaceGlyph() override;
 
-  bool SetupCairoFont(DrawTarget* aDrawTarget) override;
-
   bool AllowSubpixelAA() override { return mAllowManualShowGlyphs; }
 
   bool IsValid() const;
@@ -69,6 +67,8 @@
   already_AddRefed<mozilla::gfx::ScaledFont> GetScaledFont(
       mozilla::gfx::DrawTarget* aTarget) override;
 
+  bool ShouldRoundXOffset(cairo_t* aCairo) const override;
+
  protected:
   cairo_scaled_font_t* InitCairoScaledFont();
 
@@ -84,8 +84,8 @@
 
   gfxFloat MeasureGlyphWidth(uint16_t aGlyph);
 
-  DWRITE_MEASURING_MODE GetMeasuringMode();
-  bool GetForceGDIClassic();
+  DWRITE_MEASURING_MODE GetMeasuringMode() const;
+  bool GetForceGDIClassic() const;
 
   RefPtr<IDWriteFontFace> mFontFace;
   RefPtr<IDWriteFontFace1> mFontFace1;  // may be unavailable on older DWrite
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFcPlatformFontList.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFcPlatformFontList.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFcPlatformFontList.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFcPlatformFontList.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -91,10 +91,6 @@
   return reinterpret_cast<const char*>(aStr);
 }
 
-FT_Library gfxFcPlatformFontList::sCairoFTLibrary = nullptr;
-
-static cairo_user_data_key_t sFcFontlistUserFontDataKey;
-
 // canonical name ==> first en name or first name if no en name
 // This is the required logic for fullname lookups as per CSS3 Fonts spec.
 static uint32_t FindCanonicalNameIndex(FcPattern* aFont,
@@ -251,13 +247,10 @@
                                                bool aIgnoreFcCharmap)
     : gfxFontEntry(aFaceName),
       mFontPattern(aFontPattern),
-      mFTFace(nullptr),
       mFTFaceInitialized(false),
       mIgnoreFcCharmap(aIgnoreFcCharmap),
       mHasVariationsInitialized(false),
-      mAspect(0.0),
-      mFontData(nullptr),
-      mLength(0) {
+      mAspect(0.0) {
   GetFontProperties(aFontPattern, &mWeightRange, &mStretchRange, &mStyleRange);
 }
 
@@ -292,7 +285,8 @@
   return pattern;
 }
 
-static FT_Face CreateFaceForPattern(FcPattern* aPattern) {
+static already_AddRefed<SharedFTFace> CreateFaceForPattern(
+    FcPattern* aPattern) {
   FcChar8* filename;
   if (FcPatternGetString(aPattern, FC_FILE, 0, &filename) != FcResultMatch) {
     return nullptr;
@@ -301,31 +295,26 @@
   if (FcPatternGetInteger(aPattern, FC_INDEX, 0, &index) != FcResultMatch) {
     index = 0;  // default to 0 if not found in pattern
   }
-  return Factory::NewFTFace(nullptr, ToCharPtr(filename), index);
+  return Factory::NewSharedFTFace(nullptr, ToCharPtr(filename), index);
 }
 
 gfxFontconfigFontEntry::gfxFontconfigFontEntry(const nsACString& aFaceName,
                                                WeightRange aWeight,
                                                StretchRange aStretch,
                                                SlantStyleRange aStyle,
-                                               const uint8_t* aData,
-                                               uint32_t aLength, FT_Face aFace)
+                                               RefPtr<SharedFTFace>&& aFace)
     : gfxFontEntry(aFaceName),
-      mFTFace(aFace),
+      mFTFace(std::move(aFace)),
       mFTFaceInitialized(true),
       mIgnoreFcCharmap(true),
       mHasVariationsInitialized(false),
-      mAspect(0.0),
-      mFontData(aData),
-      mLength(aLength) {
+      mAspect(0.0) {
   mWeightRange = aWeight;
   mStyleRange = aStyle;
   mStretchRange = aStretch;
   mIsDataUserFont = true;
 
-  mFontPattern = CreatePatternForFace(mFTFace);
-
-  mUserFontData = new FTUserFontData(mFTFace, mFontData);
+  mFontPattern = CreatePatternForFace(mFTFace->GetFace());
 }
 
 gfxFontconfigFontEntry::gfxFontconfigFontEntry(const nsACString& aFaceName,
@@ -335,12 +324,9 @@
                                                SlantStyleRange aStyle)
     : gfxFontEntry(aFaceName),
       mFontPattern(aFontPattern),
-      mFTFace(nullptr),
       mFTFaceInitialized(false),
       mHasVariationsInitialized(false),
-      mAspect(0.0),
-      mFontData(nullptr),
-      mLength(0) {
+      mAspect(0.0) {
   mWeightRange = aWeight;
   mStyleRange = aStyle;
   mStretchRange = aStretch;
@@ -388,7 +374,7 @@
     // non-null here, so we don't need to do it again.
     if (sDoneVar) {
       MOZ_ASSERT(mFTFace, "How did mMMVar get set without a face?");
-      (*sDoneVar)(mFTFace->glyph->library, mMMVar);
+      (*sDoneVar)(mFTFace->GetFace()->glyph->library, mMMVar);
     } else {
       free(mMMVar);
     }
@@ -481,44 +467,17 @@
 
 hb_blob_t* gfxFontconfigFontEntry::GetFontTable(uint32_t aTableTag) {
   // for data fonts, read directly from the font data
-  if (mFontData) {
-    return gfxFontUtils::GetTableFromFontData(mFontData, aTableTag);
+  if (FTUserFontData* ufd = GetUserFontData()) {
+    return gfxFontUtils::GetTableFromFontData(ufd->FontData(), aTableTag);
   }
 
   return gfxFontEntry::GetFontTable(aTableTag);
 }
 
-void gfxFontconfigFontEntry::MaybeReleaseFTFace() {
-  // don't release if either HB or Gr face still exists
-  if (mHBFace || mGrFace) {
-    return;
-  }
-  // only close out FT_Face for system fonts, not for data fonts
-  if (!mIsDataUserFont) {
-    if (mFTFace) {
-      if (mMMVar) {
-        if (sDoneVar) {
-          (*sDoneVar)(mFTFace->glyph->library, mMMVar);
-        } else {
-          free(mMMVar);
-        }
-        mMMVar = nullptr;
-      }
-      Factory::ReleaseFTFace(mFTFace);
-      mFTFace = nullptr;
-    }
-    mFTFaceInitialized = false;
-  }
-}
-
-void gfxFontconfigFontEntry::ForgetHBFace() {
-  gfxFontEntry::ForgetHBFace();
-  MaybeReleaseFTFace();
-}
+void gfxFontconfigFontEntry::ForgetHBFace() { gfxFontEntry::ForgetHBFace(); }
 
 void gfxFontconfigFontEntry::ReleaseGrFace(gr_face* aFace) {
   gfxFontEntry::ReleaseGrFace(aFace);
-  MaybeReleaseFTFace();
 }
 
 double gfxFontconfigFontEntry::GetAspect() {
@@ -567,9 +526,15 @@
 }
 
 static void PrepareFontOptions(FcPattern* aPattern,
-                               cairo_font_options_t* aFontOptions) {
+                               cairo_font_options_t* aFontOptions,
+                               int* aOutLoadFlags, int* aOutLoadTarget,
+                               unsigned int* aOutSynthFlags) {
   NS_ASSERTION(aFontOptions, "null font options passed to PrepareFontOptions");
 
+  int loadFlags = FT_LOAD_DEFAULT;
+  int loadTarget = 0;
+  unsigned int synthFlags = 0;
+
   // xxx - taken from the gfxFontconfigFonts code, needs to be reviewed
 
   FcBool printing;
@@ -579,8 +544,8 @@
   }
 
   // Font options are set explicitly here to improve cairo's caching
-  // behavior and to record the relevant parts of the pattern for
-  // SetupCairoFont (so that the pattern can be released).
+  // behavior and to record the relevant parts of the pattern so that
+  // the pattern can be released.
   //
   // Most font_options have already been set as defaults on the FcPattern
   // with cairo_ft_font_options_substitute(), then user and system
@@ -647,29 +612,28 @@
   }
 
   cairo_hint_style_t hint_style;
-  if (printing || !hinting) {
-    hint_style = CAIRO_HINT_STYLE_NONE;
-  } else {
-    int fc_hintstyle;
-    if (FcPatternGetInteger(aPattern, FC_HINT_STYLE, 0, &fc_hintstyle) !=
-        FcResultMatch) {
-      fc_hintstyle = FC_HINT_FULL;
-    }
-    switch (fc_hintstyle) {
-      case FC_HINT_NONE:
-        hint_style = CAIRO_HINT_STYLE_NONE;
-        break;
-      case FC_HINT_SLIGHT:
-        hint_style = CAIRO_HINT_STYLE_SLIGHT;
-        break;
-      case FC_HINT_MEDIUM:
-      default:  // This fallback mirrors _get_pattern_ft_options in cairo.
-        hint_style = CAIRO_HINT_STYLE_MEDIUM;
-        break;
-      case FC_HINT_FULL:
-        hint_style = CAIRO_HINT_STYLE_FULL;
-        break;
-    }
+  int fc_hintstyle = FC_HINT_NONE;
+  if ((!printing || hinting) &&
+      FcPatternGetInteger(aPattern, FC_HINT_STYLE, 0, &fc_hintstyle) !=
+          FcResultMatch) {
+    fc_hintstyle = FC_HINT_FULL;
+  }
+  switch (fc_hintstyle) {
+    case FC_HINT_NONE:
+      hint_style = CAIRO_HINT_STYLE_NONE;
+      loadTarget = FT_LOAD_NO_HINTING;
+      break;
+    case FC_HINT_SLIGHT:
+      hint_style = CAIRO_HINT_STYLE_SLIGHT;
+      loadTarget = FT_LOAD_TARGET_LIGHT;
+      break;
+    case FC_HINT_MEDIUM:
+    default:  // This fallback mirrors _get_pattern_ft_options in cairo.
+      hint_style = CAIRO_HINT_STYLE_MEDIUM;
+      break;
+    case FC_HINT_FULL:
+      hint_style = CAIRO_HINT_STYLE_FULL;
+      break;
   }
   cairo_font_options_set_hint_style(aFontOptions, hint_style);
 
@@ -712,27 +676,73 @@
   cairo_antialias_t antialias;
   if (!fc_antialias) {
     antialias = CAIRO_ANTIALIAS_NONE;
+    if (fc_hintstyle != FC_HINT_NONE) {
+      loadTarget = FT_LOAD_TARGET_MONO;
+    }
+    loadTarget |= FT_LOAD_MONOCHROME;
   } else if (rgba == FC_RGBA_NONE) {
     antialias = CAIRO_ANTIALIAS_GRAY;
   } else {
     antialias = CAIRO_ANTIALIAS_SUBPIXEL;
+    if (fc_hintstyle == FC_HINT_FULL) {
+      loadTarget = rgba == FC_RGBA_VRGB || rgba == FC_RGBA_VBGR
+                       ? FT_LOAD_TARGET_LCD_V
+                       : FT_LOAD_TARGET_LCD;
+    }
   }
   cairo_font_options_set_antialias(aFontOptions, antialias);
-}
 
-static void ReleaseFTUserFontData(void* aData) {
-  static_cast<FTUserFontData*>(aData)->Release();
-}
+  FcBool bitmap;
+  if (FcPatternGetBool(aPattern, FC_EMBEDDED_BITMAP, 0, &bitmap) !=
+      FcResultMatch) {
+    bitmap = FcFalse;
+  }
+  if (fc_antialias && (hint_style == CAIRO_HINT_STYLE_NONE || !bitmap)) {
+    loadFlags |= FT_LOAD_NO_BITMAP;
+  }
+
+  int fc_lcd_filter;
+  if (FcPatternGetInteger(aPattern, FC_LCD_FILTER, 0, &fc_lcd_filter) ==
+      FcResultMatch) {
+    cairo_lcd_filter_t lcd_filter = CAIRO_LCD_FILTER_DEFAULT;
+    switch (fc_lcd_filter) {
+      case FC_LCD_NONE:
+        lcd_filter = CAIRO_LCD_FILTER_NONE;
+        break;
+      case FC_LCD_DEFAULT:
+        lcd_filter = CAIRO_LCD_FILTER_FIR5;
+        break;
+      case FC_LCD_LIGHT:
+        lcd_filter = CAIRO_LCD_FILTER_FIR3;
+        break;
+      case FC_LCD_LEGACY:
+        lcd_filter = CAIRO_LCD_FILTER_INTRA_PIXEL;
+        break;
+    }
+    cairo_font_options_set_lcd_filter(aFontOptions, lcd_filter);
+  }
 
-static cairo_user_data_key_t sFcFontlistFTFaceKey;
+  FcBool autohint;
+  if (FcPatternGetBool(aPattern, FC_AUTOHINT, 0, &autohint) == FcResultMatch &&
+      autohint) {
+    loadFlags |= FT_LOAD_FORCE_AUTOHINT;
+  }
+
+  FcBool embolden;
+  if (FcPatternGetBool(aPattern, FC_EMBOLDEN, 0, &embolden) == FcResultMatch &&
+      embolden) {
+    synthFlags |= CAIRO_FT_SYNTHESIZE_BOLD;
+  }
 
-static void ReleaseFTFace(void* aData) {
-  Factory::ReleaseFTFace(static_cast<FT_Face>(aData));
+  *aOutLoadFlags = loadFlags;
+  *aOutLoadTarget = loadTarget;
+  *aOutSynthFlags = synthFlags;
 }
 
 cairo_scaled_font_t* gfxFontconfigFontEntry::CreateScaledFont(
     FcPattern* aRenderPattern, gfxFloat aAdjustedSize,
-    const gfxFontStyle* aStyle, FT_Face aFTFace) {
+    const gfxFontStyle* aStyle, RefPtr<SharedFTFace> aFTFace,
+    int* aOutLoadFlags, unsigned int* aOutSynthFlags) {
   if (aStyle->NeedsSyntheticBold(this)) {
     FcPatternAddBool(aRenderPattern, FC_EMBOLDEN, FcTrue);
   }
@@ -748,45 +758,24 @@
     FcPatternAddBool(aRenderPattern, FC_EMBEDDED_BITMAP, FcFalse);
   }
 
-  AutoTArray<FT_Fixed, 8> coords;
-  if (HasVariations()) {
-    FT_Face ftFace = GetFTFace();
-    if (ftFace) {
-      AutoTArray<gfxFontVariation, 8> settings;
-      GetVariationsForStyle(settings, *aStyle);
-      gfxFT2FontBase::SetupVarCoords(GetMMVar(), settings, &coords);
-    }
+  if (HasVariations() && aFTFace != mFTFace) {
+    AutoTArray<gfxFontVariation, 8> settings;
+    GetVariationsForStyle(settings, *aStyle);
+    gfxFT2FontBase::SetupVarCoords(GetMMVar(), settings, aFTFace->GetFace());
   }
 
-  cairo_font_face_t* face = cairo_ft_font_face_create_for_pattern(
-      aRenderPattern, coords.Elements(), coords.Length());
-
-  if (aFTFace) {
-    if (cairo_font_face_set_user_data(face, &sFcFontlistFTFaceKey, aFTFace,
-                                      ReleaseFTFace) != CAIRO_STATUS_SUCCESS) {
-      NS_WARNING("Failed binding FT_Face to Cairo font face");
-      cairo_font_face_destroy(face);
-      Factory::ReleaseFTFace(aFTFace);
-      return nullptr;
-    }
-  }
+  cairo_font_options_t* fontOptions = cairo_font_options_create();
+  int loadFlags;
+  int loadTarget;
+  unsigned int synthFlags;
+  PrepareFontOptions(aRenderPattern, fontOptions, &loadFlags, &loadTarget,
+                     &synthFlags);
 
-  if (mFontData) {
-    // for data fonts, add the face/data pointer to the cairo font face
-    // so that it ges deleted whenever cairo decides
-    NS_ASSERTION(mFTFace, "FT_Face is null when setting user data");
-    NS_ASSERTION(mUserFontData,
-                 "user font data is null when setting user data");
-    mUserFontData.get()->AddRef();
-    if (cairo_font_face_set_user_data(face, &sFcFontlistUserFontDataKey,
-                                      mUserFontData, ReleaseFTUserFontData) !=
-        CAIRO_STATUS_SUCCESS) {
-      NS_WARNING("Failed binding FTUserFontData to Cairo font face");
-      mUserFontData.get()->Release();
-      cairo_font_face_destroy(face);
-      return nullptr;
-    }
-  }
+  *aOutLoadFlags = loadFlags | loadTarget;
+  *aOutSynthFlags = synthFlags;
+
+  cairo_font_face_t* face = cairo_ft_font_face_create_for_ft_face(
+      aFTFace->GetFace(), loadFlags, synthFlags, aFTFace.get());
 
   cairo_scaled_font_t* scaledFont = nullptr;
 
@@ -796,9 +785,6 @@
   cairo_matrix_init_scale(&sizeMatrix, aAdjustedSize, aAdjustedSize);
   cairo_matrix_init_identity(&identityMatrix);
 
-  cairo_font_options_t* fontOptions = cairo_font_options_create();
-  PrepareFontOptions(aRenderPattern, fontOptions);
-
   scaledFont =
       cairo_scaled_font_create(face, &sizeMatrix, &identityMatrix, fontOptions);
   cairo_font_options_destroy(fontOptions);
@@ -892,12 +878,11 @@
 }
 
 already_AddRefed<UnscaledFontFontconfig>
-gfxFontconfigFontEntry::UnscaledFontCache::Lookup(const char* aFile,
+gfxFontconfigFontEntry::UnscaledFontCache::Lookup(const std::string& aFile,
                                                   uint32_t aIndex) {
   for (size_t i = 0; i < kNumEntries; i++) {
     RefPtr<UnscaledFontFontconfig> entry(mUnscaledFonts[i]);
-    if (entry && !strcmp(entry->GetFile(), aFile) &&
-        entry->GetIndex() == aIndex) {
+    if (entry && entry->GetFile() == aFile && entry->GetIndex() == aIndex) {
       MoveToFront(i);
       return entry.forget();
     }
@@ -941,11 +926,6 @@
 
 gfxFont* gfxFontconfigFontEntry::CreateFontInstance(
     const gfxFontStyle* aFontStyle) {
-  FcPattern* fontPattern = mFontPattern;
-  if (!fontPattern) {
-    return nullptr;
-  }
-
   nsAutoRef<FcPattern> pattern(FcPatternCreate());
   if (!pattern) {
     NS_WARNING("Failed to create Fontconfig pattern for font instance");
@@ -955,25 +935,25 @@
   double size = ChooseFontSize(this, *aFontStyle);
   FcPatternAddDouble(pattern, FC_PIXEL_SIZE, size);
 
-  FT_Face face = mFTFace;
-  if (face && face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
-    // For variation fonts, we create a new FT_Face and FcPattern here
-    // so that variation coordinates from the style can be applied
-    // without affecting other font instances created from the same
-    // entry (font resource).
-    if (mFontData) {
+  RefPtr<SharedFTFace> face = GetFTFace();
+  if (!face) {
+    NS_WARNING("Failed to get FreeType face for pattern");
+    return nullptr;
+  }
+  if (face->GetFace()->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
+    // For variation fonts, we create a new FT_Face here so that
+    // variation coordinates from the style can be applied without
+    // affecting other font instances created from the same entry
+    // (font resource).
+    if (face->GetData()) {
       // For user fonts: create a new FT_Face from the font data, and then
       // make a pattern from that.
-      face = Factory::NewFTFaceFromData(nullptr, mFontData, mLength, 0);
-      fontPattern = CreatePatternForFace(face);
+      face = face->GetData()->CloneFace();
     } else {
       // For system fonts: create a new FT_Face and store it in a copy of
       // the original mFontPattern.
-      fontPattern = FcPatternDuplicate(mFontPattern);
-      face = CreateFaceForPattern(fontPattern);
-      if (face) {
-        FcPatternAddFTFace(fontPattern, FC_FT_FACE, face);
-      } else {
+      face = CreateFaceForPattern(mFontPattern);
+      if (!face) {
         // I don't think CreateFaceForPattern above should ever fail,
         // but just in case let's fall back here.
         face = mFTFace;
@@ -983,51 +963,49 @@
 
   PreparePattern(pattern, aFontStyle->printerFont);
   nsAutoRef<FcPattern> renderPattern(
-      FcFontRenderPrepare(nullptr, pattern, fontPattern));
-  if (fontPattern != mFontPattern) {
-    // Discard temporary pattern used for variation support
-    FcPatternDestroy(fontPattern);
-  }
+      FcFontRenderPrepare(nullptr, pattern, mFontPattern));
   if (!renderPattern) {
     NS_WARNING("Failed to prepare Fontconfig pattern for font instance");
-    if (face != mFTFace) {
-      Factory::ReleaseFTFace(face);
-    }
     return nullptr;
   }
 
+  int loadFlags;
+  unsigned int synthFlags;
   cairo_scaled_font_t* scaledFont = CreateScaledFont(
-      renderPattern, size, aFontStyle, face != mFTFace ? face : nullptr);
+      renderPattern, size, aFontStyle, face, &loadFlags, &synthFlags);
 
-  const FcChar8* file = ToFcChar8Ptr("");
+  std::string file;
   int index = 0;
-  if (!mFontData) {
+  if (!face->GetData()) {
+    const FcChar8* fcFile;
     if (FcPatternGetString(renderPattern, FC_FILE, 0,
-                           const_cast<FcChar8**>(&file)) != FcResultMatch ||
+                           const_cast<FcChar8**>(&fcFile)) != FcResultMatch ||
         FcPatternGetInteger(renderPattern, FC_INDEX, 0, &index) !=
             FcResultMatch) {
       NS_WARNING("No file in Fontconfig pattern for font instance");
       return nullptr;
     }
+    file = ToCharPtr(fcFile);
   }
 
   RefPtr<UnscaledFontFontconfig> unscaledFont =
-      mUnscaledFontCache.Lookup(ToCharPtr(file), index);
+      mUnscaledFontCache.Lookup(file, index);
   if (!unscaledFont) {
-    unscaledFont = mFontData
-                       ? new UnscaledFontFontconfig(mFTFace)
-                       : new UnscaledFontFontconfig(ToCharPtr(file), index);
+    unscaledFont = mFTFace->GetData() ? new UnscaledFontFontconfig(mFTFace)
+                                      : new UnscaledFontFontconfig(
+                                            std::move(file), index, mFTFace);
     mUnscaledFontCache.Add(unscaledFont);
   }
 
   gfxFont* newFont = new gfxFontconfigFont(
-      unscaledFont, scaledFont, renderPattern, size, this, aFontStyle);
+      unscaledFont, scaledFont, std::move(face), renderPattern, size, this,
+      aFontStyle, loadFlags, (synthFlags & CAIRO_FT_SYNTHESIZE_BOLD) != 0);
   cairo_scaled_font_destroy(scaledFont);
 
   return newFont;
 }
 
-FT_Face gfxFontconfigFontEntry::GetFTFace() {
+const RefPtr<SharedFTFace>& gfxFontconfigFontEntry::GetFTFace() {
   if (!mFTFaceInitialized) {
     mFTFaceInitialized = true;
     mFTFace = CreateFaceForPattern(mFontPattern);
@@ -1035,6 +1013,13 @@
   return mFTFace;
 }
 
+FTUserFontData* gfxFontconfigFontEntry::GetUserFontData() {
+  if (mFTFace && mFTFace->GetData()) {
+    return static_cast<FTUserFontData*>(mFTFace->GetData());
+  }
+  return nullptr;
+}
+
 bool gfxFontconfigFontEntry::HasVariations() {
   if (mHasVariationsInitialized) {
     return mHasVariations;
@@ -1056,9 +1041,9 @@
       mHasVariations = true;
     }
   } else {
-    FT_Face face = GetFTFace();
-    if (face) {
-      mHasVariations = face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS;
+    if (GetFTFace()) {
+      mHasVariations =
+          mFTFace->GetFace()->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS;
     }
   }
 
@@ -1074,11 +1059,10 @@
   if (!sGetVar) {
     return nullptr;
   }
-  FT_Face face = GetFTFace();
-  if (!face) {
+  if (!GetFTFace()) {
     return nullptr;
   }
-  if (FT_Err_Ok != (*sGetVar)(face, &mMMVar)) {
+  if (FT_Err_Ok != (*sGetVar)(mFTFace->GetFace(), &mMMVar)) {
     mMMVar = nullptr;
   }
   return mMMVar;
@@ -1105,20 +1089,20 @@
   NS_ASSERTION(!mIsDataUserFont,
                "data fonts should be reading tables directly from memory");
 
-  FT_Face face = GetFTFace();
-  if (!face) {
+  if (!GetFTFace()) {
     return NS_ERROR_NOT_AVAILABLE;
   }
 
   FT_ULong length = 0;
-  if (FT_Load_Sfnt_Table(face, aTableTag, 0, nullptr, &length) != 0) {
+  if (FT_Load_Sfnt_Table(mFTFace->GetFace(), aTableTag, 0, nullptr, &length) !=
+      0) {
     return NS_ERROR_NOT_AVAILABLE;
   }
   if (!aBuffer.SetLength(length, fallible)) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
-  if (FT_Load_Sfnt_Table(face, aTableTag, 0, aBuffer.Elements(), &length) !=
-      0) {
+  if (FT_Load_Sfnt_Table(mFTFace->GetFace(), aTableTag, 0, aBuffer.Elements(),
+                         &length) != 0) {
     aBuffer.Clear();
     return NS_ERROR_FAILURE;
   }
@@ -1370,12 +1354,14 @@
 
 gfxFontconfigFont::gfxFontconfigFont(
     const RefPtr<UnscaledFontFontconfig>& aUnscaledFont,
-    cairo_scaled_font_t* aScaledFont, FcPattern* aPattern,
-    gfxFloat aAdjustedSize, gfxFontEntry* aFontEntry,
-    const gfxFontStyle* aFontStyle)
-    : gfxFT2FontBase(aUnscaledFont, aScaledFont, aFontEntry, aFontStyle),
+    cairo_scaled_font_t* aScaledFont, RefPtr<SharedFTFace>&& aFTFace,
+    FcPattern* aPattern, gfxFloat aAdjustedSize, gfxFontEntry* aFontEntry,
+    const gfxFontStyle* aFontStyle, int aLoadFlags, bool aEmbolden)
+    : gfxFT2FontBase(aUnscaledFont, aScaledFont, std::move(aFTFace), aFontEntry,
+                     aFontStyle, aLoadFlags, aEmbolden),
       mPattern(aPattern) {
   mAdjustedSize = aAdjustedSize;
+  InitMetrics();
 }
 
 gfxFontconfigFont::~gfxFontconfigFont() {}
@@ -1383,12 +1369,9 @@
 already_AddRefed<ScaledFont> gfxFontconfigFont::GetScaledFont(
     mozilla::gfx::DrawTarget* aTarget) {
   if (!mAzureScaledFont) {
-    NativeFont nativeFont;
-    nativeFont.mType = NativeFontType::FONTCONFIG_PATTERN;
-    nativeFont.mFont = GetPattern();
-
-    mAzureScaledFont = Factory::CreateScaledFontForNativeFont(
-        nativeFont, GetUnscaledFont(), GetAdjustedSize(), GetCairoScaledFont());
+    mAzureScaledFont = Factory::CreateScaledFontForFontconfigFont(
+        GetUnscaledFont(), GetAdjustedSize(), GetCairoScaledFont(), mFTFace,
+        GetPattern());
     InitializeScaledFont();
   }
 
@@ -1396,6 +1379,10 @@
   return scaledFont.forget();
 }
 
+bool gfxFontconfigFont::ShouldHintMetrics() const {
+  return !GetStyle()->printerFont;
+}
+
 gfxFcPlatformFontList::gfxFcPlatformFontList()
     : mLocalNames(64),
       mGenericMappings(32),
@@ -1984,21 +1971,14 @@
     const nsACString& aFontName, WeightRange aWeightForEntry,
     StretchRange aStretchForEntry, SlantStyleRange aStyleForEntry,
     const uint8_t* aFontData, uint32_t aLength) {
-  FT_Face face = Factory::NewFTFaceFromData(nullptr, aFontData, aLength, 0);
+  RefPtr<FTUserFontData> ufd = new FTUserFontData(aFontData, aLength);
+  RefPtr<SharedFTFace> face = ufd->CloneFace();
   if (!face) {
-    free((void*)aFontData);
     return nullptr;
   }
-  if (FT_Err_Ok != FT_Select_Charmap(face, FT_ENCODING_UNICODE) &&
-      FT_Err_Ok != FT_Select_Charmap(face, FT_ENCODING_MS_SYMBOL)) {
-    Factory::ReleaseFTFace(face);
-    free((void*)aFontData);
-    return nullptr;
-  }
-
   return new gfxFontconfigFontEntry(aFontName, aWeightForEntry,
-                                    aStretchForEntry, aStyleForEntry, aFontData,
-                                    aLength, face);
+                                    aStretchForEntry, aStyleForEntry,
+                                    std::move(face));
 }
 
 bool gfxFcPlatformFontList::FindAndAddFamilies(
@@ -2252,44 +2232,6 @@
   mAlwaysUseFontconfigGenerics = PrefFontListsUseOnlyGenerics();
 }
 
-/* static */
-FT_Library gfxFcPlatformFontList::GetFTLibrary() {
-  if (!sCairoFTLibrary) {
-    // Use cairo's FT_Library so that cairo takes care of shutdown of the
-    // FT_Library after it has destroyed its font_faces, and FT_Done_Face
-    // has been called on each FT_Face, at least until this bug is fixed:
-    // https://bugs.freedesktop.org/show_bug.cgi?id=18857
-    //
-    // Cairo keeps it's own FT_Library object for creating FT_Face
-    // instances, so use that. There's no simple API for accessing this
-    // so use the hacky method below of making a font and extracting
-    // the library pointer from that.
-
-    FcPattern* pat =
-        FcPatternBuild(0, FC_FAMILY, FcTypeString, "serif", (char*)0);
-    cairo_font_face_t* face =
-        cairo_ft_font_face_create_for_pattern(pat, nullptr, 0);
-    FcPatternDestroy(pat);
-
-    cairo_matrix_t identity;
-    cairo_matrix_init_identity(&identity);
-    cairo_font_options_t* options = cairo_font_options_create();
-    cairo_scaled_font_t* sf =
-        cairo_scaled_font_create(face, &identity, &identity, options);
-    cairo_font_options_destroy(options);
-    cairo_font_face_destroy(face);
-
-    FT_Face ft = cairo_ft_scaled_font_lock_face(sf);
-
-    sCairoFTLibrary = ft->glyph->library;
-
-    cairo_ft_scaled_font_unlock_face(sf);
-    cairo_scaled_font_destroy(sf);
-  }
-
-  return sCairoFTLibrary;
-}
-
 gfxPlatformFontList::PrefFontList* gfxFcPlatformFontList::FindGenericFamilies(
     const nsCString& aGeneric, nsAtom* aLanguage) {
   // set up name
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFcPlatformFontList.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFcPlatformFontList.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFcPlatformFontList.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFcPlatformFontList.h	2019-09-15 11:33:11.000000000 +0000
@@ -47,34 +47,6 @@
   static void AddRef(FcConfig* ptr) { FcConfigReference(ptr); }
 };
 
-// Helper classes used for clearning out user font data when cairo font
-// face is destroyed. Since multiple faces may use the same data, be
-// careful to assure that the data is only cleared out when all uses
-// expire. The font entry object contains a refptr to FTUserFontData and
-// each cairo font created from that font entry contains a
-// FTUserFontDataRef with a refptr to that same FTUserFontData object.
-
-class FTUserFontData final {
- public:
-  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FTUserFontData)
-
-  explicit FTUserFontData(FT_Face aFace, const uint8_t* aData)
-      : mFace(aFace), mFontData(aData) {}
-
-  const uint8_t* FontData() const { return mFontData; }
-
- private:
-  ~FTUserFontData() {
-    mozilla::gfx::Factory::ReleaseFTFace(mFace);
-    if (mFontData) {
-      free((void*)mFontData);
-    }
-  }
-
-  FT_Face mFace;
-  const uint8_t* mFontData;
-};
-
 // The names for the font entry and font classes should really
 // the common 'Fc' abbreviation but the gfxPangoFontGroup code already
 // defines versions of these, so use the verbose name for now.
@@ -90,8 +62,8 @@
   // of the font data and the FT_Face
   explicit gfxFontconfigFontEntry(const nsACString& aFaceName,
                                   WeightRange aWeight, StretchRange aStretch,
-                                  SlantStyleRange aStyle, const uint8_t* aData,
-                                  uint32_t aLength, FT_Face aFace);
+                                  SlantStyleRange aStyle,
+                                  RefPtr<mozilla::gfx::SharedFTFace>&& aFace);
 
   // used for @font-face local system fonts with explicit patterns
   explicit gfxFontconfigFontEntry(const nsACString& aFaceName,
@@ -106,7 +78,8 @@
   nsresult ReadCMAP(FontInfoData* aFontInfoData = nullptr) override;
   bool TestCharacterMap(uint32_t aCh) override;
 
-  FT_Face GetFTFace();
+  const RefPtr<mozilla::gfx::SharedFTFace>& GetFTFace();
+  FTUserFontData* GetUserFontData();
 
   FT_MM_Var* GetMMVar() override;
 
@@ -128,26 +101,20 @@
   gfxFont* CreateFontInstance(const gfxFontStyle* aFontStyle) override;
 
   // helper method for creating cairo font from pattern
-  cairo_scaled_font_t* CreateScaledFont(FcPattern* aRenderPattern,
-                                        gfxFloat aAdjustedSize,
-                                        const gfxFontStyle* aStyle,
-                                        FT_Face aFTFace);
+  cairo_scaled_font_t* CreateScaledFont(
+      FcPattern* aRenderPattern, gfxFloat aAdjustedSize,
+      const gfxFontStyle* aStyle, RefPtr<mozilla::gfx::SharedFTFace> aFTFace,
+      int* aOutLoadFlags, unsigned int* aOutSynthFlags);
 
   // override to pull data from FTFace
   virtual nsresult CopyFontTable(uint32_t aTableTag,
                                  nsTArray<uint8_t>& aBuffer) override;
 
-  // if HB or GR faces are gone, close down the FT_Face
-  void MaybeReleaseFTFace();
-
   // pattern for a single face of a family
   nsCountedRef<FcPattern> mFontPattern;
 
-  // user font data, when needed
-  RefPtr<FTUserFontData> mUserFontData;
-
   // FTFace - initialized when needed
-  FT_Face mFTFace;
+  RefPtr<mozilla::gfx::SharedFTFace> mFTFace;
   bool mFTFaceInitialized;
 
   // Whether TestCharacterMap should check the actual cmap rather than asking
@@ -166,14 +133,10 @@
 
   double mAspect;
 
-  // data font
-  const uint8_t* mFontData;
-  uint32_t mLength;
-
   class UnscaledFontCache {
    public:
     already_AddRefed<mozilla::gfx::UnscaledFontFontconfig> Lookup(
-        const char* aFile, uint32_t aIndex);
+        const std::string& aFile, uint32_t aIndex);
 
     void Add(
         const RefPtr<mozilla::gfx::UnscaledFontFontconfig>& aUnscaledFont) {
@@ -244,9 +207,10 @@
  public:
   gfxFontconfigFont(
       const RefPtr<mozilla::gfx::UnscaledFontFontconfig>& aUnscaledFont,
-      cairo_scaled_font_t* aScaledFont, FcPattern* aPattern,
+      cairo_scaled_font_t* aScaledFont,
+      RefPtr<mozilla::gfx::SharedFTFace>&& aFTFace, FcPattern* aPattern,
       gfxFloat aAdjustedSize, gfxFontEntry* aFontEntry,
-      const gfxFontStyle* aFontStyle);
+      const gfxFontStyle* aFontStyle, int aLoadFlags, bool aEmbolden);
 
   FontType GetType() const override { return FONT_TYPE_FONTCONFIG; }
   virtual FcPattern* GetPattern() const { return mPattern; }
@@ -254,6 +218,8 @@
   virtual already_AddRefed<mozilla::gfx::ScaledFont> GetScaledFont(
       DrawTarget* aTarget) override;
 
+  bool ShouldHintMetrics() const override;
+
  private:
   virtual ~gfxFontconfigFont();
 
@@ -322,8 +288,6 @@
   void GetSampleLangForGroup(nsAtom* aLanguage, nsACString& aLangStr,
                              bool aForFontEnumerationThread = false);
 
-  static FT_Library GetFTLibrary();
-
  protected:
   virtual ~gfxFcPlatformFontList();
 
@@ -396,7 +360,7 @@
   // Note: langGroup == x-math is handled separately
   bool mAlwaysUseFontconfigGenerics;
 
-  static FT_Library sCairoFTLibrary;
+  static FT_Library sFTLibrary;
 };
 
 #endif /* GFXPLATFORMFONTLIST_H_ */
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFont.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFont.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFont.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFont.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -789,6 +789,10 @@
   ++gFontCount;
 #endif
 
+  if (MOZ_UNLIKELY(StaticPrefs::gfx_text_disable_aa_AtStartup())) {
+    mAntialiasOption = kAntialiasNone;
+  }
+
   // Turn off AA for Ahem for testing purposes when requested.
   if (MOZ_UNLIKELY(StaticPrefs::gfx_font_rendering_ahem_antialias_none() &&
                    mFontEntry->FamilyName().EqualsLiteral("Ahem"))) {
@@ -818,95 +822,45 @@
 //
 gfxFont::RoundingFlags gfxFont::GetRoundOffsetsToPixels(
     DrawTarget* aDrawTarget) {
-  RoundingFlags result = RoundingFlags(0);
-
   // Could do something fancy here for ScaleFactors of
   // AxisAlignedTransforms, but we leave things simple.
   // Not much point rounding if a matrix will mess things up anyway.
-  // Also return false for non-cairo contexts.
-  if (aDrawTarget->GetTransform().HasNonTranslation()) {
-    return result;
-  }
-
-  // All raster backends snap glyphs to pixels vertically.
-  // Print backends set CAIRO_HINT_METRICS_OFF.
-  result |= RoundingFlags::kRoundY;
-
-  // If we can't set up the cairo font, bail out.
-  if (!SetupCairoFont(aDrawTarget)) {
-    return result;
-  }
-
-  cairo_t* cr = gfxFont::RefCairo(aDrawTarget);
-  cairo_scaled_font_t* scaled_font = cairo_get_scaled_font(cr);
-
-  // bug 1198921 - this sometimes fails under Windows for whatver reason
-  NS_ASSERTION(scaled_font,
-               "null cairo scaled font should never be returned "
-               "by cairo_get_scaled_font");
-  if (!scaled_font) {
-    result |= RoundingFlags::kRoundX;  // default to the same as the fallback
-                                       // path below
-    return result;
+  // Also check if the font already knows hint metrics is off...
+  if (aDrawTarget->GetTransform().HasNonTranslation() || !ShouldHintMetrics()) {
+    return RoundingFlags(0);
+  }
+
+  cairo_t* cr = nullptr;
+  if (aDrawTarget->GetBackendType() == BackendType::CAIRO) {
+    cr = static_cast<cairo_t*>(
+        aDrawTarget->GetNativeSurface(NativeSurfaceType::CAIRO_CONTEXT));
+    cairo_surface_t* target = cairo_get_target(cr);
+
+    // Check whether the cairo surface's font options hint metrics.
+    cairo_font_options_t* fontOptions = cairo_font_options_create();
+    cairo_surface_get_font_options(target, fontOptions);
+    cairo_hint_metrics_t hintMetrics =
+        cairo_font_options_get_hint_metrics(fontOptions);
+    cairo_font_options_destroy(fontOptions);
+
+    switch (hintMetrics) {
+      case CAIRO_HINT_METRICS_OFF:
+        return RoundingFlags(0);
+      case CAIRO_HINT_METRICS_ON:
+        return RoundingFlags::kRoundX | RoundingFlags::kRoundY;
+      default:
+        break;
+    }
   }
 
-  // Sometimes hint metrics gets set for us, most notably for printing.
-#ifdef MOZ_TREE_CAIRO
-  cairo_hint_metrics_t hint_metrics =
-      cairo_scaled_font_get_hint_metrics(scaled_font);
-#else
-  cairo_font_options_t* font_options = cairo_font_options_create();
-  cairo_scaled_font_get_font_options(scaled_font, font_options);
-  cairo_hint_metrics_t hint_metrics =
-      cairo_font_options_get_hint_metrics(font_options);
-  cairo_font_options_destroy(font_options);
-#endif
-
-  switch (hint_metrics) {
-    case CAIRO_HINT_METRICS_OFF:
-      result &= ~RoundingFlags::kRoundY;
-      return result;
-    case CAIRO_HINT_METRICS_DEFAULT:
-      // Here we mimic what cairo surface/font backends do.  Printing
-      // surfaces have already been handled by hint_metrics.  The
-      // fallback show_glyphs implementation composites pixel-aligned
-      // glyph surfaces, so we just pick surface/font combinations that
-      // override this.
-      switch (cairo_scaled_font_get_type(scaled_font)) {
-#if CAIRO_HAS_DWRITE_FONT  // dwrite backend is not in std cairo releases yet
-        case CAIRO_FONT_TYPE_DWRITE:
-          // show_glyphs is implemented on the font and so is used for
-          // all surface types; however, it may pixel-snap depending on
-          // the dwrite rendering mode
-          if (!cairo_dwrite_scaled_font_get_force_GDI_classic(scaled_font) &&
-              gfxWindowsPlatform::GetPlatform()->DWriteMeasuringMode() ==
-                  DWRITE_MEASURING_MODE_NATURAL) {
-            return result;
-          }
-          MOZ_FALLTHROUGH;
-#endif
-        case CAIRO_FONT_TYPE_QUARTZ:
-          // Quartz surfaces implement show_glyphs for Quartz fonts
-          if (cairo_surface_get_type(cairo_get_target(cr)) ==
-              CAIRO_SURFACE_TYPE_QUARTZ) {
-            return result;
-          }
-          break;
-        default:
-          break;
-      }
-      break;
-    case CAIRO_HINT_METRICS_ON:
-      break;
+  if (ShouldRoundXOffset(cr)) {
+    return RoundingFlags::kRoundX | RoundingFlags::kRoundY;
+  } else {
+    return RoundingFlags::kRoundY;
   }
-  result |= RoundingFlags::kRoundX;
-  return result;
 }
 
 gfxFloat gfxFont::GetGlyphHAdvance(DrawTarget* aDrawTarget, uint16_t aGID) {
-  if (!SetupCairoFont(aDrawTarget)) {
-    return 0;
-  }
   if (ProvidesGlyphWidths()) {
     return GetGlyphWidth(aGID) / 65536.0;
   }
@@ -3392,38 +3346,6 @@
   return fe->FindOrMakeFont(&style, mUnicodeRangeMap);
 }
 
-static void DestroyRefCairo(void* aData) {
-  cairo_t* refCairo = static_cast<cairo_t*>(aData);
-  MOZ_ASSERT(refCairo);
-  cairo_destroy(refCairo);
-}
-
-/* static */
-cairo_t* gfxFont::RefCairo(DrawTarget* aDT) {
-  // DrawTargets that don't use a Cairo backend can be given a 1x1 "reference"
-  // |cairo_t*|, stored in the DrawTarget's user data, for doing font-related
-  // operations.
-  static UserDataKey sRefCairo;
-
-  cairo_t* refCairo = nullptr;
-  if (aDT->GetBackendType() == BackendType::CAIRO) {
-    refCairo = static_cast<cairo_t*>(
-        aDT->GetNativeSurface(NativeSurfaceType::CAIRO_CONTEXT));
-    if (refCairo) {
-      return refCairo;
-    }
-  }
-
-  refCairo = static_cast<cairo_t*>(aDT->GetUserData(&sRefCairo));
-  if (!refCairo) {
-    refCairo = cairo_create(
-        gfxPlatform::GetPlatform()->ScreenReferenceSurface()->CairoSurface());
-    aDT->AddUserData(&sRefCairo, refCairo, DestroyRefCairo);
-  }
-
-  return refCairo;
-}
-
 gfxGlyphExtents* gfxFont::GetOrCreateGlyphExtents(int32_t aAppUnitsPerDevUnit) {
   uint32_t i, count = mGlyphExtentsArray.Length();
   for (i = 0; i < count; ++i) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFont.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFont.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFont.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFont.h	2019-09-15 11:33:10.000000000 +0000
@@ -1520,6 +1520,9 @@
   // when rendering to the given drawTarget.
   RoundingFlags GetRoundOffsetsToPixels(DrawTarget* aDrawTarget);
 
+  virtual bool ShouldHintMetrics() const { return true; }
+  virtual bool ShouldRoundXOffset(cairo_t* aCairo) const { return true; }
+
   // Font metrics
   struct Metrics {
     gfxFloat capHeight;
@@ -1686,13 +1689,9 @@
 
   gfxGlyphExtents* GetOrCreateGlyphExtents(int32_t aAppUnitsPerDevUnit);
 
-  // You need to call SetupCairoFont on aDrawTarget just before calling this.
   void SetupGlyphExtents(DrawTarget* aDrawTarget, uint32_t aGlyphID,
                          bool aNeedTight, gfxGlyphExtents* aExtents);
 
-  // This is called by the default Draw() implementation above.
-  virtual bool SetupCairoFont(DrawTarget* aDrawTarget) = 0;
-
   virtual bool AllowSubpixelAA() { return true; }
 
   bool IsSyntheticBold() const { return mApplySyntheticBold; }
@@ -1862,11 +1861,6 @@
   // glyphs. This does not add a reference to the returned font.
   gfxFont* GetSubSuperscriptFont(int32_t aAppUnitsPerDevPixel);
 
-  /**
-   * Return the reference cairo_t object from aDT.
-   */
-  static cairo_t* RefCairo(mozilla::gfx::DrawTarget* aDT);
-
  protected:
   virtual const Metrics& GetHorizontalMetrics() = 0;
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2FontBase.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2FontBase.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2FontBase.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2FontBase.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -17,6 +17,9 @@
 #include FT_ADVANCES_H
 #include FT_MULTIPLE_MASTERS_H
 
+#ifndef FT_LOAD_COLOR
+#  define FT_LOAD_COLOR (1L << 20)
+#endif
 #ifndef FT_FACE_FLAG_COLOR
 #  define FT_FACE_FLAG_COLOR (1L << 14)
 #endif
@@ -25,20 +28,34 @@
 
 gfxFT2FontBase::gfxFT2FontBase(
     const RefPtr<UnscaledFontFreeType>& aUnscaledFont,
-    cairo_scaled_font_t* aScaledFont, gfxFontEntry* aFontEntry,
-    const gfxFontStyle* aFontStyle)
+    cairo_scaled_font_t* aScaledFont,
+    RefPtr<mozilla::gfx::SharedFTFace>&& aFTFace, gfxFontEntry* aFontEntry,
+    const gfxFontStyle* aFontStyle, int aLoadFlags, bool aEmbolden)
     : gfxFont(aUnscaledFont, aFontEntry, aFontStyle, kAntialiasDefault,
               aScaledFont),
-      mSpaceGlyph(0) {
-  mEmbolden = aFontStyle->NeedsSyntheticBold(aFontEntry);
-
+      mFTFace(std::move(aFTFace)),
+      mSpaceGlyph(0),
+      mFTLoadFlags(aLoadFlags | FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH |
+                   FT_LOAD_COLOR),
+      mEmbolden(aEmbolden) {
   cairo_scaled_font_reference(mScaledFont);
-
-  InitMetrics();
 }
 
 gfxFT2FontBase::~gfxFT2FontBase() { cairo_scaled_font_destroy(mScaledFont); }
 
+FT_Face gfxFT2FontBase::LockFTFace() {
+  if (!mFTFace->Lock(this)) {
+    FT_Set_Transform(mFTFace->GetFace(), nullptr, nullptr);
+
+    gfxFloat size = std::max(GetAdjustedSize(), 1.0);
+    FT_Set_Char_Size(mFTFace->GetFace(), FT_F26Dot6(size * 64.0 + 0.5),
+                     FT_F26Dot6(size * 64.0 + 0.5), 0, 0);
+  }
+  return mFTFace->GetFace();
+}
+
+void gfxFT2FontBase::UnlockFTFace() { mFTFace->Unlock(); }
+
 uint32_t gfxFT2FontBase::GetGlyph(uint32_t aCharCode) {
   // FcFreeTypeCharIndex needs to lock the FT_Face and can end up searching
   // through all the postscript glyph names in the font.  Therefore use a
@@ -97,22 +114,6 @@
   return slot->mGlyphIndex;
 }
 
-void gfxFT2FontBase::GetGlyphExtents(uint32_t aGlyph,
-                                     cairo_text_extents_t* aExtents) {
-  MOZ_ASSERT(aExtents != nullptr, "aExtents must not be NULL");
-
-  cairo_glyph_t glyphs[1];
-  glyphs[0].index = aGlyph;
-  glyphs[0].x = 0.0;
-  glyphs[0].y = 0.0;
-  // cairo does some caching for us here but perhaps a small gain could be
-  // made by caching more.  It is usually only the advance that is needed,
-  // so caching only the advance could allow many requests to be cached with
-  // little memory use.  Ideally this cache would be merged with
-  // gfxGlyphExtents.
-  cairo_scaled_font_glyph_extents(GetCairoScaledFont(), glyphs, 1, aExtents);
-}
-
 // aScale is intended for a 16.16 x/y_scale of an FT_Size_Metrics
 static inline FT_Long ScaleRoundDesignUnits(FT_Short aDesignMetric,
                                             FT_Fixed aScale) {
@@ -142,13 +143,18 @@
  * The return value is the glyph id of that glyph or zero if no such glyph
  * exists.  aExtents is only set when this returns a non-zero glyph id.
  */
-uint32_t gfxFT2FontBase::GetCharExtents(char aChar,
-                                        cairo_text_extents_t* aExtents) {
+uint32_t gfxFT2FontBase::GetCharExtents(char aChar, gfxFloat* aWidth,
+                                        gfxFloat* aHeight) {
   FT_UInt gid = GetGlyph(aChar);
-  if (gid) {
-    GetGlyphExtents(gid, aExtents);
+  int32_t width;
+  int32_t height;
+  if (gid && GetFTGlyphExtents(gid, &width, &height)) {
+    *aWidth = FLOAT_FROM_16_16(width);
+    *aHeight = FLOAT_FROM_26_6(height);
+    return gid;
+  } else {
+    return 0;
   }
-  return gid;
 }
 
 /**
@@ -159,16 +165,13 @@
  */
 uint32_t gfxFT2FontBase::GetCharWidth(char aChar, gfxFloat* aWidth) {
   FT_UInt gid = GetGlyph(aChar);
-  if (gid) {
-    int32_t width;
-    if (!GetFTGlyphAdvance(gid, &width)) {
-      cairo_text_extents_t extents;
-      GetGlyphExtents(gid, &extents);
-      width = NS_lround(0x10000 * extents.x_advance);
-    }
+  int32_t width;
+  if (gid && GetFTGlyphExtents(gid, &width)) {
     *aWidth = FLOAT_FROM_16_16(width);
+    return gid;
+  } else {
+    return 0;
   }
-  return gid;
 }
 
 void gfxFT2FontBase::InitMetrics() {
@@ -183,7 +186,7 @@
 
   // Explicitly lock the face so we can release it early before calling
   // back into Cairo below.
-  FT_Face face = cairo_ft_scaled_font_lock_face(GetCairoScaledFont());
+  FT_Face face = LockFTFace();
 
   if (MOZ_UNLIKELY(!face)) {
     // No face.  This unfortunate situation might happen if the font
@@ -213,30 +216,6 @@
     return;
   }
 
-  if (face->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS) {
-    // Resolve variations from entry (descriptor) and style (property)
-    AutoTArray<gfxFontVariation, 8> settings;
-    mFontEntry->GetVariationsForStyle(settings, mStyle);
-    SetupVarCoords(mFontEntry->GetMMVar(), settings, &mCoords);
-    if (!mCoords.IsEmpty()) {
-#if MOZ_TREE_FREETYPE
-      FT_Set_Var_Design_Coordinates(face, mCoords.Length(), mCoords.Elements());
-#else
-      typedef FT_Error (*SetCoordsFunc)(FT_Face, FT_UInt, FT_Fixed*);
-      static SetCoordsFunc setCoords;
-      static bool firstTime = true;
-      if (firstTime) {
-        firstTime = false;
-        setCoords =
-            (SetCoordsFunc)dlsym(RTLD_DEFAULT, "FT_Set_Var_Design_Coordinates");
-      }
-      if (setCoords) {
-        (*setCoords)(face, mCoords.Length(), mCoords.Elements());
-      }
-#endif
-    }
-  }
-
   const FT_Size_Metrics& ftMetrics = face->size->metrics;
 
   mMetrics.maxAscent = FLOAT_FROM_26_6(ftMetrics.ascender);
@@ -382,7 +361,7 @@
 
   // Release the face lock to safely load glyphs with GetCharExtents if
   // necessary without recursively locking.
-  cairo_ft_scaled_font_unlock_face(GetCairoScaledFont());
+  UnlockFTFace();
 
   gfxFloat width;
   mSpaceGlyph = GetCharWidth(' ', &width);
@@ -402,14 +381,15 @@
   // hinting, but maybe the x extents are not quite right in some fancy
   // script fonts.  CSS 2.1 suggests possibly using the height of an "o",
   // which would have a more consistent glyph across fonts.
-  cairo_text_extents_t extents;
-  if (GetCharExtents('x', &extents) && extents.y_bearing < 0.0) {
-    mMetrics.xHeight = -extents.y_bearing;
-    mMetrics.aveCharWidth = std::max(mMetrics.aveCharWidth, extents.x_advance);
+  gfxFloat xWidth;
+  gfxFloat xHeight;
+  if (GetCharExtents('x', &xWidth, &xHeight) && xHeight < 0.0) {
+    mMetrics.xHeight = -xHeight;
+    mMetrics.aveCharWidth = std::max(mMetrics.aveCharWidth, xWidth);
   }
 
-  if (GetCharExtents('H', &extents) && extents.y_bearing < 0.0) {
-    mMetrics.capHeight = -extents.y_bearing;
+  if (GetCharExtents('H', &xWidth, &xHeight) && xHeight < 0.0) {
+    mMetrics.capHeight = -xHeight;
   }
 
   mMetrics.aveCharWidth = std::max(mMetrics.aveCharWidth, mMetrics.zeroWidth);
@@ -486,7 +466,27 @@
   return GetGlyph(unicode);
 }
 
-bool gfxFT2FontBase::GetFTGlyphAdvance(uint16_t aGID, int32_t* aAdvance) {
+FT_Fixed gfxFT2FontBase::GetEmboldenAdvance(FT_Face aFace, FT_Fixed aAdvance) {
+  // If freetype emboldening is being used, and it's not a zero-width glyph,
+  // adjust the advance to account for the increased width.
+  if (!mEmbolden || !aAdvance) {
+    return 0;
+  }
+  // This is the embolden "strength" used by FT_GlyphSlot_Embolden,
+  // converted from 26.6 to 16.16
+  FT_Fixed strength =
+      FT_MulFix(aFace->units_per_EM, aFace->size->metrics.y_scale) / 24;
+  if (aFace->glyph->format == FT_GLYPH_FORMAT_BITMAP) {
+    strength &= -64;
+    if (!strength) {
+      strength = 64;
+    }
+  }
+  return strength << 10;
+}
+
+bool gfxFT2FontBase::GetFTGlyphExtents(uint16_t aGID, int32_t* aAdvance,
+                                       int32_t* aHeight) {
   gfxFT2LockedFace face(this);
   MOZ_ASSERT(face.get());
   if (!face.get()) {
@@ -495,23 +495,7 @@
     return false;
   }
 
-  // Due to bugs like 1435234 and 1440938, we currently prefer to fall back
-  // to reading the advance from cairo extents, unless we're dealing with
-  // a variation font (for which cairo metrics may be wrong, due to FreeType
-  // bug 52683).
-  if (!(face.get()->face_flags & FT_FACE_FLAG_SCALABLE) ||
-      !(face.get()->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS)) {
-    return false;
-  }
-
-  bool hinting = gfxPlatform::GetPlatform()->FontHintingEnabled();
-  int32_t flags =
-      hinting ? FT_LOAD_ADVANCE_ONLY
-              : FT_LOAD_ADVANCE_ONLY | FT_LOAD_NO_AUTOHINT | FT_LOAD_NO_HINTING;
-  if (face.get()->face_flags & FT_FACE_FLAG_TRICKY) {
-    flags &= ~FT_LOAD_NO_AUTOHINT;
-  }
-  FT_Error ftError = Factory::LoadFTGlyph(face.get(), aGID, flags);
+  FT_Error ftError = Factory::LoadFTGlyph(face.get(), aGID, mFTLoadFlags);
   if (ftError != FT_Err_Ok) {
     // FT_Face was somehow broken/invalid? Don't try to access glyph slot.
     // This probably shouldn't happen, but does: see bug 1440938.
@@ -519,27 +503,31 @@
     return false;
   }
 
-  // Due to freetype bug 52683 we MUST use the linearHoriAdvance field when
-  // dealing with a variation font. (And other fonts would have returned
-  // earlier, so only variation fonts currently reach here.)
-  FT_Fixed advance = face.get()->glyph->linearHoriAdvance;
+  bool hintMetrics = ShouldHintMetrics();
 
-  // If freetype emboldening is being used, and it's not a zero-width glyph,
-  // adjust the advance to account for the increased width.
-  if (mEmbolden && advance > 0) {
-    // This is the embolden "strength" used by FT_GlyphSlot_Embolden,
-    // converted from 26.6 to 16.16
-    FT_Fixed strength =
-        1024 *
-        FT_MulFix(face.get()->units_per_EM, face.get()->size->metrics.y_scale) /
-        24;
-    advance += strength;
+  // Due to freetype bug 52683 we MUST use the linearHoriAdvance field when
+  // dealing with a variation font; also use it for scalable fonts when not
+  // applying hinting. Otherwise, prefer hinted width from glyph->advance.x.
+  FT_Fixed advance;
+  if (face.get()->glyph->format == FT_GLYPH_FORMAT_OUTLINE &&
+      (!hintMetrics || FT_HAS_MULTIPLE_MASTERS(face.get()))) {
+    advance = face.get()->glyph->linearHoriAdvance;
+  } else {
+    advance = face.get()->glyph->advance.x << 10;  // convert 26.6 to 16.16
+  }
+  advance += GetEmboldenAdvance(face.get(), advance);
+  if (hintMetrics && (mFTLoadFlags & FT_LOAD_NO_HINTING)) {
+    advance = (advance + 0x8000) & 0xffff0000u;
+  }
+  *aAdvance = advance;
+
+  if (aHeight) {
+    FT_F26Dot6 height = -face.get()->glyph->metrics.horiBearingY;
+    if (hintMetrics && (mFTLoadFlags & FT_LOAD_NO_HINTING)) {
+      height &= -64;
+    }
+    *aHeight = height;
   }
-
-  // Round the 16.16 fixed-point value to whole pixels for better consistency
-  // with how cairo renders the glyphs.
-  *aAdvance = (advance + 0x8000) & 0xffff0000u;
-
   return true;
 }
 
@@ -554,75 +542,66 @@
     return width;
   }
 
-  if (!GetFTGlyphAdvance(aGID, &width)) {
-    cairo_text_extents_t extents;
-    GetGlyphExtents(aGID, &extents);
-    width = NS_lround(0x10000 * extents.x_advance);
+  if (!GetFTGlyphExtents(aGID, &width)) {
+    width = 0;
   }
   mGlyphWidths->Put(aGID, width);
 
   return width;
 }
 
-bool gfxFT2FontBase::SetupCairoFont(DrawTarget* aDrawTarget) {
-  // The scaled font ctm is not relevant right here because
-  // cairo_set_scaled_font does not record the scaled font itself, but
-  // merely the font_face, font_matrix, font_options.  The scaled_font used
-  // for the target can be different from the scaled_font passed to
-  // cairo_set_scaled_font.  (Unfortunately we have measured only for an
-  // identity ctm.)
-  cairo_scaled_font_t* cairoFont = GetCairoScaledFont();
-
-  if (cairo_scaled_font_status(cairoFont) != CAIRO_STATUS_SUCCESS) {
-    // Don't cairo_set_scaled_font as that would propagate the error to
-    // the cairo_t, precluding any further drawing.
-    return false;
-  }
-  // Thoughts on which font_options to set on the context:
-  //
-  // cairoFont has been created for screen rendering.
-  //
-  // When the context is being used for screen rendering, we should set
-  // font_options such that the same scaled_font gets used (when the ctm is
-  // the same).  The use of explicit font_options recorded in
-  // CreateScaledFont ensures that this will happen.
-  //
-  // XXXkt: For pdf and ps surfaces, I don't know whether it's better to
-  // remove surface-specific options, or try to draw with the same
-  // scaled_font that was used to measure.  As the same font_face is being
-  // used, its font_options will often override some values anyway (unless
-  // perhaps we remove those from the FcPattern at face creation).
-  //
-  // I can't see any significant difference in printing, irrespective of
-  // what is set here.  It's too late to change things here as measuring has
-  // already taken place.  We should really be measuring with a different
-  // font for pdf and ps surfaces (bug 403513).
-  cairo_set_scaled_font(gfxFont::RefCairo(aDrawTarget), cairoFont);
-  return true;
-}
-
 // For variation fonts, figure out the variation coordinates to be applied
 // for each axis, in freetype's order (which may not match the order of
 // axes in mStyle.variationSettings, so we need to search by axis tag).
 /*static*/
 void gfxFT2FontBase::SetupVarCoords(
     FT_MM_Var* aMMVar, const nsTArray<gfxFontVariation>& aVariations,
-    nsTArray<FT_Fixed>* aCoords) {
-  aCoords->TruncateLength(0);
+    FT_Face aFTFace) {
   if (!aMMVar) {
     return;
   }
 
+  nsTArray<FT_Fixed> coords;
   for (unsigned i = 0; i < aMMVar->num_axis; ++i) {
-    aCoords->AppendElement(aMMVar->axis[i].def);
+    coords.AppendElement(aMMVar->axis[i].def);
     for (const auto& v : aVariations) {
       if (aMMVar->axis[i].tag == v.mTag) {
         FT_Fixed val = v.mValue * 0x10000;
         val = std::min(val, aMMVar->axis[i].maximum);
         val = std::max(val, aMMVar->axis[i].minimum);
-        (*aCoords)[i] = val;
+        coords[i] = val;
         break;
       }
     }
   }
+
+  if (!coords.IsEmpty()) {
+#if MOZ_TREE_FREETYPE
+    FT_Set_Var_Design_Coordinates(aFTFace, coords.Length(), coords.Elements());
+#else
+    typedef FT_Error (*SetCoordsFunc)(FT_Face, FT_UInt, FT_Fixed*);
+    static SetCoordsFunc setCoords;
+    static bool firstTime = true;
+    if (firstTime) {
+      firstTime = false;
+      setCoords =
+          (SetCoordsFunc)dlsym(RTLD_DEFAULT, "FT_Set_Var_Design_Coordinates");
+    }
+    if (setCoords) {
+      (*setCoords)(aFTFace, coords.Length(), coords.Elements());
+    }
+#endif
+  }
+}
+
+already_AddRefed<SharedFTFace> FTUserFontData::CloneFace(int aFaceIndex) {
+  RefPtr<SharedFTFace> face = Factory::NewSharedFTFaceFromData(
+      nullptr, mFontData, mLength, aFaceIndex, this);
+  if (!face ||
+      (FT_Select_Charmap(face->GetFace(), FT_ENCODING_UNICODE) != FT_Err_Ok &&
+       FT_Select_Charmap(face->GetFace(), FT_ENCODING_MS_SYMBOL) !=
+           FT_Err_Ok)) {
+    return nullptr;
+  }
+  return face.forget();
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2FontBase.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2FontBase.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2FontBase.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2FontBase.h	2019-09-15 11:33:11.000000000 +0000
@@ -18,12 +18,12 @@
  public:
   gfxFT2FontBase(
       const RefPtr<mozilla::gfx::UnscaledFontFreeType>& aUnscaledFont,
-      cairo_scaled_font_t* aScaledFont, gfxFontEntry* aFontEntry,
-      const gfxFontStyle* aFontStyle);
+      cairo_scaled_font_t* aScaledFont,
+      RefPtr<mozilla::gfx::SharedFTFace>&& aFTFace, gfxFontEntry* aFontEntry,
+      const gfxFontStyle* aFontStyle, int aLoadFlags, bool aEmbolden);
   virtual ~gfxFT2FontBase();
 
   uint32_t GetGlyph(uint32_t aCharCode);
-  void GetGlyphExtents(uint32_t aGlyph, cairo_text_extents_t* aExtents);
   uint32_t GetSpaceGlyph() override;
   bool ProvidesGetGlyph() const override { return true; }
   virtual uint32_t GetGlyph(uint32_t unicode,
@@ -31,30 +31,34 @@
   bool ProvidesGlyphWidths() const override { return true; }
   int32_t GetGlyphWidth(uint16_t aGID) override;
 
-  bool SetupCairoFont(DrawTarget* aDrawTarget) override;
-
   FontType GetType() const override { return FONT_TYPE_FT2; }
 
   static void SetupVarCoords(FT_MM_Var* aMMVar,
                              const nsTArray<gfxFontVariation>& aVariations,
-                             nsTArray<FT_Fixed>* aCoords);
+                             FT_Face aFTFace);
+
+  FT_Face LockFTFace();
+  void UnlockFTFace();
 
  private:
-  uint32_t GetCharExtents(char aChar, cairo_text_extents_t* aExtents);
+  uint32_t GetCharExtents(char aChar, gfxFloat* aWidth, gfxFloat* aHeight);
   uint32_t GetCharWidth(char aChar, gfxFloat* aWidth);
 
-  // Get advance of a single glyph from FreeType, and return true;
-  // or return false if we should fall back to getting the glyph
-  // extents from cairo instead.
-  bool GetFTGlyphAdvance(uint16_t aGID, int32_t* aWidth);
-
-  void InitMetrics();
+  // Get advance (and optionally height) of a single glyph from FreeType,
+  // and return true, or return false if we failed.
+  bool GetFTGlyphExtents(uint16_t aGID, int32_t* aWidth,
+                         int32_t* aHeight = nullptr);
 
  protected:
+  void InitMetrics();
   const Metrics& GetHorizontalMetrics() override;
+  FT_Fixed GetEmboldenAdvance(FT_Face aFace, FT_Fixed aAdvance);
+
+  RefPtr<mozilla::gfx::SharedFTFace> mFTFace;
 
   uint32_t mSpaceGlyph;
   Metrics mMetrics;
+  int mFTLoadFlags;
   bool mEmbolden;
 
   // For variation/multiple-master fonts, this will be an array of the values
@@ -67,4 +71,35 @@
   mozilla::UniquePtr<nsDataHashtable<nsUint32HashKey, int32_t>> mGlyphWidths;
 };
 
+// Helper classes used for clearing out user font data when FT font
+// face is destroyed. Since multiple faces may use the same data, be
+// careful to assure that the data is only cleared out when all uses
+// expire. The font entry object contains a refptr to FTUserFontData and
+// each FT face created from that font entry contains a refptr to that
+// same FTUserFontData object.
+
+class FTUserFontData final
+    : public mozilla::gfx::SharedFTFaceRefCountedData<FTUserFontData> {
+ public:
+  NS_INLINE_DECL_THREADSAFE_REFCOUNTING(FTUserFontData)
+
+  FTUserFontData(const uint8_t* aData, uint32_t aLength)
+      : mFontData(aData), mLength(aLength) {}
+
+  const uint8_t* FontData() const { return mFontData; }
+
+  already_AddRefed<mozilla::gfx::SharedFTFace> CloneFace(
+      int aFaceIndex = 0) override;
+
+ private:
+  ~FTUserFontData() {
+    if (mFontData) {
+      free((void*)mFontData);
+    }
+  }
+
+  const uint8_t* mFontData;
+  uint32_t mLength;
+};
+
 #endif /* GFX_FT2FONTBASE_H */
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2FontList.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2FontList.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2FontList.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2FontList.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -63,8 +63,6 @@
 #define LOG(args) MOZ_LOG(sFontInfoLog, mozilla::LogLevel::Debug, args)
 #define LOG_ENABLED() MOZ_LOG_TEST(sFontInfoLog, mozilla::LogLevel::Debug)
 
-static cairo_user_data_key_t sFTUserFontDataKey;
-
 static __inline void BuildKeyNameFromFontName(nsACString& aName) {
   ToLowerCase(aName);
 }
@@ -76,91 +74,65 @@
 // memory long-term.
 // This may fail (resulting in a null FT_Face), e.g. if it fails to
 // allocate memory to uncompress a font from omnijar.
-class AutoFTFace {
- public:
-  explicit AutoFTFace(FT2FontEntry* aFontEntry)
-      : mFace(nullptr),
-        mFontDataBuf(nullptr),
-        mDataLength(0),
-        mOwnsFace(false) {
-    if (aFontEntry->mFTFace) {
-      mFace = aFontEntry->mFTFace;
-      return;
-    }
-
-    NS_ASSERTION(!aFontEntry->mFilename.IsEmpty(),
-                 "can't use AutoFTFace for fonts without a filename");
-
-    // A relative path (no initial "/") means this is a resource in
-    // omnijar, not an installed font on the device.
-    // The NS_ASSERTIONs here should never fail, as the resource must have
-    // been read successfully during font-list initialization or we'd never
-    // have created the font entry. The only legitimate runtime failure
-    // here would be memory allocation, in which case mFace remains null.
-    if (aFontEntry->mFilename[0] != '/') {
-      RefPtr<nsZipArchive> reader = Omnijar::GetReader(Omnijar::Type::GRE);
-      nsZipItem* item = reader->GetItem(aFontEntry->mFilename.get());
-      NS_ASSERTION(item, "failed to find zip entry");
-
-      uint32_t bufSize = item->RealSize();
-      mFontDataBuf = static_cast<uint8_t*>(malloc(bufSize));
-      if (mFontDataBuf) {
-        nsZipCursor cursor(item, reader, mFontDataBuf, bufSize);
-        cursor.Copy(&bufSize);
-        NS_ASSERTION(bufSize == item->RealSize(), "error reading bundled font");
-        mDataLength = bufSize;
-        mFace = Factory::NewFTFaceFromData(nullptr, mFontDataBuf, bufSize,
-                                           aFontEntry->mFTFontIndex);
-        if (!mFace) {
-          NS_WARNING("failed to create freetype face");
-        }
-      }
-    } else {
-      mFace = Factory::NewFTFace(nullptr, aFontEntry->mFilename.get(),
-                                 aFontEntry->mFTFontIndex);
-      if (!mFace) {
+already_AddRefed<SharedFTFace> FT2FontEntry::GetFTFace(bool aCommit) {
+  if (mFTFace) {
+    return do_AddRef(mFTFace);
+  }
+
+  NS_ASSERTION(!mFilename.IsEmpty(),
+               "can't use GetFTFace for fonts without a filename");
+
+  // A relative path (no initial "/") means this is a resource in
+  // omnijar, not an installed font on the device.
+  // The NS_ASSERTIONs here should never fail, as the resource must have
+  // been read successfully during font-list initialization or we'd never
+  // have created the font entry. The only legitimate runtime failure
+  // here would be memory allocation, in which case mFace remains null.
+  RefPtr<SharedFTFace> face;
+  if (mFilename[0] != '/') {
+    RefPtr<nsZipArchive> reader = Omnijar::GetReader(Omnijar::Type::GRE);
+    nsZipItem* item = reader->GetItem(mFilename.get());
+    NS_ASSERTION(item, "failed to find zip entry");
+
+    uint32_t bufSize = item->RealSize();
+    uint8_t* fontDataBuf = static_cast<uint8_t*>(malloc(bufSize));
+    if (fontDataBuf) {
+      nsZipCursor cursor(item, reader, fontDataBuf, bufSize);
+      cursor.Copy(&bufSize);
+      NS_ASSERTION(bufSize == item->RealSize(), "error reading bundled font");
+      RefPtr<FTUserFontData> ufd = new FTUserFontData(fontDataBuf, bufSize);
+      face = ufd->CloneFace(mFTFontIndex);
+      if (!face) {
         NS_WARNING("failed to create freetype face");
+        return nullptr;
       }
     }
-    if (FT_Err_Ok != FT_Select_Charmap(mFace, FT_ENCODING_UNICODE) &&
-        FT_Err_Ok != FT_Select_Charmap(mFace, FT_ENCODING_MS_SYMBOL)) {
+  } else {
+    face = Factory::NewSharedFTFace(nullptr, mFilename.get(), mFTFontIndex);
+    if (!face) {
+      NS_WARNING("failed to create freetype face");
+      return nullptr;
+    }
+    if (FT_Err_Ok != FT_Select_Charmap(face->GetFace(), FT_ENCODING_UNICODE) &&
+        FT_Err_Ok !=
+            FT_Select_Charmap(face->GetFace(), FT_ENCODING_MS_SYMBOL)) {
       NS_WARNING("failed to select Unicode or symbol charmap");
     }
-    mOwnsFace = true;
   }
 
-  ~AutoFTFace() {
-    if (mFace && mOwnsFace) {
-      Factory::ReleaseFTFace(mFace);
-      if (mFontDataBuf) {
-        free(mFontDataBuf);
-      }
-    }
+  if (aCommit) {
+    mFTFace = face;
   }
 
-  operator FT_Face() { return mFace; }
+  return face.forget();
+}
 
-  // If we 'forget' the FT_Face (used when ownership is handed over to Cairo),
-  // we do -not- free the mFontDataBuf (if used); that also becomes the
-  // responsibility of the new owner of the face.
-  FT_Face forget() {
-    NS_ASSERTION(mOwnsFace, "can't forget() when we didn't own the face");
-    mOwnsFace = false;
-    return mFace;
+FTUserFontData* FT2FontEntry::GetUserFontData() {
+  if (mFTFace && mFTFace->GetData()) {
+    return static_cast<FTUserFontData*>(mFTFace->GetData());
   }
-
-  const uint8_t* FontData() const { return mFontDataBuf; }
-  uint32_t DataLength() const { return mDataLength; }
-
- private:
-  FT_Face mFace;
-  uint8_t* mFontDataBuf;  // Uncompressed data (for fonts stored in a JAR),
-                          // or null for fonts instantiated from a file.
-                          // If non-null, this must survive as long as the
-                          // FT_Face.
-  uint32_t mDataLength;   // Size of mFontDataBuf, if present.
-  bool mOwnsFace;
-};
+  return nullptr;
+}
 
 /*
  * FT2FontEntry
@@ -173,8 +145,25 @@
  */
 
 cairo_scaled_font_t* FT2FontEntry::CreateScaledFont(
-    const gfxFontStyle* aStyle) {
-  cairo_font_face_t* cairoFace = CairoFontFace(aStyle);
+    const gfxFontStyle* aStyle, RefPtr<SharedFTFace> aFace, int* aOutLoadFlags,
+    unsigned int* aOutSynthFlags) {
+  int loadFlags = gfxPlatform::GetPlatform()->FontHintingEnabled()
+                      ? FT_LOAD_DEFAULT
+                      : (FT_LOAD_NO_AUTOHINT | FT_LOAD_NO_HINTING);
+  if (aFace->GetFace()->face_flags & FT_FACE_FLAG_TRICKY) {
+    loadFlags &= ~FT_LOAD_NO_AUTOHINT;
+  }
+
+  unsigned int synthFlags = 0;
+  if (aStyle->NeedsSyntheticBold(this)) {
+    synthFlags |= CAIRO_FT_SYNTHESIZE_BOLD;
+  }
+
+  *aOutLoadFlags = loadFlags;
+  *aOutSynthFlags = synthFlags;
+
+  cairo_font_face_t* cairoFace = cairo_ft_font_face_create_for_ft_face(
+      aFace->GetFace(), loadFlags, synthFlags, aFace.get());
   if (!cairoFace) {
     return nullptr;
   }
@@ -206,18 +195,8 @@
 
 FT2FontEntry::~FT2FontEntry() {
   if (mMMVar) {
-    FT_Done_MM_Var(mFTFace->glyph->library, mMMVar);
-  }
-
-  // Do nothing for mFTFace here since FTFontDestroyFunc is called by cairo.
-  mFTFace = nullptr;
-
-#ifndef ANDROID
-  if (mFontFace) {
-    cairo_font_face_destroy(mFontFace);
-    mFontFace = nullptr;
+    FT_Done_MM_Var(mFTFace->GetFace()->glyph->library, mMMVar);
   }
-#endif
 }
 
 gfxFontEntry* FT2FontEntry::Clone() const {
@@ -231,29 +210,56 @@
   return fe;
 }
 
-static cairo_user_data_key_t sFTFaceKey;
+gfxFont* FT2FontEntry::CreateFontInstance(const gfxFontStyle* aStyle) {
+  RefPtr<SharedFTFace> face = GetFTFace(true);
+  if (!face) {
+    return nullptr;
+  }
+
+  // If variations are present, we will not use our cached mFTFace
+  // but always create a new one as it will have custom variation
+  // coordinates applied.
+  if ((!mVariationSettings.IsEmpty() ||
+       (aStyle && !aStyle->variationSettings.IsEmpty())) &&
+      (face->GetFace()->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS)) {
+    // Create a separate FT_Face because we need to apply custom
+    // variation settings to it.
+    RefPtr<SharedFTFace> varFace;
+    if (!mFilename.IsEmpty() && mFilename[0] == '/') {
+      varFace =
+          Factory::NewSharedFTFace(nullptr, mFilename.get(), mFTFontIndex);
+    } else {
+      varFace = face->GetData()->CloneFace(mFTFontIndex);
+    }
+    if (varFace) {
+      // Resolve variations from entry (descriptor) and style (property)
+      AutoTArray<gfxFontVariation, 8> settings;
+      GetVariationsForStyle(settings, aStyle ? *aStyle : gfxFontStyle());
+      gfxFT2FontBase::SetupVarCoords(GetMMVar(), settings, varFace->GetFace());
+      face = std::move(varFace);
+    }
+  }
 
-gfxFont* FT2FontEntry::CreateFontInstance(const gfxFontStyle* aFontStyle) {
-  cairo_scaled_font_t* scaledFont = CreateScaledFont(aFontStyle);
+  int loadFlags;
+  unsigned int synthFlags;
+  cairo_scaled_font_t* scaledFont =
+      CreateScaledFont(aStyle, face, &loadFlags, &synthFlags);
   if (!scaledFont) {
     return nullptr;
   }
 
   RefPtr<UnscaledFontFreeType> unscaledFont(mUnscaledFont);
   if (!unscaledFont) {
-    unscaledFont =
-        !mFilename.IsEmpty() && mFilename[0] == '/'
-            ? new UnscaledFontFreeType(mFilename.BeginReading(), mFTFontIndex)
-            : new UnscaledFontFreeType(mFTFace);
+    unscaledFont = !mFilename.IsEmpty() && mFilename[0] == '/'
+                       ? new UnscaledFontFreeType(mFilename.BeginReading(),
+                                                  mFTFontIndex, mFTFace)
+                       : new UnscaledFontFreeType(mFTFace);
     mUnscaledFont = unscaledFont;
   }
 
-  cairo_font_face_t* face = cairo_scaled_font_get_font_face(scaledFont);
-  FT_Face ftFace =
-      static_cast<FT_Face>(cairo_font_face_get_user_data(face, &sFTFaceKey));
-
-  gfxFont* font = new gfxFT2Font(unscaledFont, scaledFont,
-                                 ftFace ? ftFace : mFTFace, this, aFontStyle);
+  gfxFont* font =
+      new gfxFT2Font(unscaledFont, scaledFont, std::move(face), this, aStyle,
+                     loadFlags, (synthFlags & CAIRO_FT_SYNTHESIZE_BOLD) != 0);
   cairo_scaled_font_destroy(scaledFont);
   return font;
 }
@@ -265,22 +271,17 @@
   // Ownership of aFontData is passed in here; the fontEntry must
   // retain it as long as the FT_Face needs it, and ensure it is
   // eventually deleted.
-  FT_Face face = Factory::NewFTFaceFromData(nullptr, aFontData, aLength, 0);
+  RefPtr<FTUserFontData> ufd = new FTUserFontData(aFontData, aLength);
+  RefPtr<SharedFTFace> face = ufd->CloneFace();
   if (!face) {
-    free((void*)aFontData);
-    return nullptr;
-  }
-  if (FT_Err_Ok != FT_Select_Charmap(face, FT_ENCODING_UNICODE) &&
-      FT_Err_Ok != FT_Select_Charmap(face, FT_ENCODING_MS_SYMBOL)) {
-    Factory::ReleaseFTFace(face);
-    free((void*)aFontData);
     return nullptr;
   }
   // Create our FT2FontEntry, which inherits the name of the userfont entry
   // as it's not guaranteed that the face has valid names (bug 737315)
-  FT2FontEntry* fe = FT2FontEntry::CreateFontEntry(face, nullptr, 0, aFontName,
-                                                   aFontData, aLength);
+  FT2FontEntry* fe =
+      FT2FontEntry::CreateFontEntry(face->GetFace(), nullptr, 0, aFontName);
   if (fe) {
+    fe->mFTFace = face;
     fe->mStyleRange = aStyle;
     fe->mWeightRange = aWeight;
     fe->mStretchRange = aStretch;
@@ -289,32 +290,6 @@
   return fe;
 }
 
-class FTUserFontData {
- public:
-  FTUserFontData(FT_Face aFace, const uint8_t* aData, uint32_t aLength)
-      : mFace(aFace), mFontData(aData), mLength(aLength) {}
-
-  ~FTUserFontData() {
-    Factory::ReleaseFTFace(mFace);
-    if (mFontData) {
-      free((void*)mFontData);
-    }
-  }
-
-  const uint8_t* FontData() const { return mFontData; }
-  uint32_t Length() const { return mLength; }
-
- private:
-  FT_Face mFace;
-  const uint8_t* mFontData;
-  uint32_t mLength;
-};
-
-static void FTFontDestroyFunc(void* data) {
-  FTUserFontData* userFontData = static_cast<FTUserFontData*>(data);
-  delete userFontData;
-}
-
 /* static */
 FT2FontEntry* FT2FontEntry::CreateFontEntry(const FontListEntry& aFLE) {
   FT2FontEntry* fe = new FT2FontEntry(aFLE.faceName());
@@ -368,9 +343,10 @@
 // as we don't want to keep a freetype face for every installed font
 // permanently in memory.
 /* static */
-FT2FontEntry* FT2FontEntry::CreateFontEntry(
-    FT_Face aFace, const char* aFilename, uint8_t aIndex,
-    const nsACString& aName, const uint8_t* aFontData, uint32_t aLength) {
+FT2FontEntry* FT2FontEntry::CreateFontEntry(FT_Face aFace,
+                                            const char* aFilename,
+                                            uint8_t aIndex,
+                                            const nsACString& aName) {
   FT2FontEntry* fe = new FT2FontEntry(aName);
   fe->mStyleRange =
       SlantStyleRange(FTFaceIsItalic(aFace) ? FontSlantStyle::Italic()
@@ -379,22 +355,6 @@
   fe->mFilename = aFilename;
   fe->mFTFontIndex = aIndex;
 
-  if (aFontData) {
-    fe->mFTFace = aFace;
-    int flags = gfxPlatform::GetPlatform()->FontHintingEnabled()
-                    ? FT_LOAD_DEFAULT
-                    : (FT_LOAD_NO_AUTOHINT | FT_LOAD_NO_HINTING);
-    if (aFace->face_flags & FT_FACE_FLAG_TRICKY) {
-      flags &= ~FT_LOAD_NO_AUTOHINT;
-    }
-    fe->mFontFace =
-        cairo_ft_font_face_create_for_ft_face(aFace, flags, nullptr, 0);
-    FTUserFontData* userFontData =
-        new FTUserFontData(aFace, aFontData, aLength);
-    cairo_font_face_set_user_data(fe->mFontFace, &sFTUserFontDataKey,
-                                  userFontData, FTFontDestroyFunc);
-  }
-
   return fe;
 }
 
@@ -417,76 +377,6 @@
   return static_cast<FT2FontEntry*>(mFontEntry.get());
 }
 
-cairo_font_face_t* FT2FontEntry::CairoFontFace(const gfxFontStyle* aStyle) {
-  // Create our basic (no-variations) mFontFace if not already present;
-  // this also ensures we have mFTFace available.
-  if (!mFontFace) {
-    AutoFTFace face(this);
-    if (!face) {
-      return nullptr;
-    }
-    int flags = gfxPlatform::GetPlatform()->FontHintingEnabled()
-                    ? FT_LOAD_DEFAULT
-                    : (FT_LOAD_NO_AUTOHINT | FT_LOAD_NO_HINTING);
-    if (FT_Face(face)->face_flags & FT_FACE_FLAG_TRICKY) {
-      flags &= ~FT_LOAD_NO_AUTOHINT;
-    }
-    mFontFace = cairo_ft_font_face_create_for_ft_face(face, flags, nullptr, 0);
-    auto userFontData =
-        new FTUserFontData(face, face.FontData(), face.DataLength());
-    cairo_font_face_set_user_data(mFontFace, &sFTUserFontDataKey, userFontData,
-                                  FTFontDestroyFunc);
-    mFTFace = face.forget();
-  }
-
-  // If variations are present, we will not use our cached mFontFace
-  // but always create a new cairo_font_face_t because its FT_Face will
-  // have custom variation coordinates applied.
-  if ((!mVariationSettings.IsEmpty() ||
-       (aStyle && !aStyle->variationSettings.IsEmpty())) &&
-      (mFTFace->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS)) {
-    int flags = gfxPlatform::GetPlatform()->FontHintingEnabled()
-                    ? FT_LOAD_DEFAULT
-                    : (FT_LOAD_NO_AUTOHINT | FT_LOAD_NO_HINTING);
-    if (mFTFace->face_flags & FT_FACE_FLAG_TRICKY) {
-      flags &= ~FT_LOAD_NO_AUTOHINT;
-    }
-    // Resolve variations from entry (descriptor) and style (property)
-    AutoTArray<gfxFontVariation, 8> settings;
-    GetVariationsForStyle(settings, aStyle ? *aStyle : gfxFontStyle());
-    AutoTArray<FT_Fixed, 8> coords;
-    gfxFT2FontBase::SetupVarCoords(GetMMVar(), settings, &coords);
-    // Create a separate FT_Face because we need to apply custom
-    // variation settings to it.
-    FT_Face ftFace;
-    if (!mFilename.IsEmpty() && mFilename[0] == '/') {
-      ftFace = Factory::NewFTFace(nullptr, mFilename.get(), mFTFontIndex);
-    } else {
-      auto ufd = reinterpret_cast<FTUserFontData*>(
-          cairo_font_face_get_user_data(mFontFace, &sFTUserFontDataKey));
-      ftFace = Factory::NewFTFaceFromData(nullptr, ufd->FontData(),
-                                          ufd->Length(), mFTFontIndex);
-    }
-    // The variation coordinates will actually be applied to ftFace by
-    // gfxFT2FontBase::InitMetrics, so we don't need to do it here.
-    cairo_font_face_t* cairoFace = cairo_ft_font_face_create_for_ft_face(
-        ftFace, flags, coords.Elements(), coords.Length());
-    // Set up user data to properly release the FT_Face when the cairo face
-    // is deleted.
-    if (cairo_font_face_set_user_data(
-            cairoFace, &sFTFaceKey, ftFace,
-            (cairo_destroy_func_t)&Factory::ReleaseFTFace)) {
-      // set_user_data failed! discard, and fall back to default face
-      cairo_font_face_destroy(cairoFace);
-      FT_Done_Face(ftFace);
-    } else {
-      return cairoFace;
-    }
-  }
-
-  return mFontFace;
-}
-
 // Copied/modified from similar code in gfxMacPlatformFontList.mm:
 // Complex scripts will not render correctly unless Graphite or OT
 // layout tables are present.
@@ -560,14 +450,14 @@
 
 nsresult FT2FontEntry::CopyFontTable(uint32_t aTableTag,
                                      nsTArray<uint8_t>& aBuffer) {
-  AutoFTFace face(this);
+  RefPtr<SharedFTFace> face = GetFTFace();
   if (!face) {
     return NS_ERROR_FAILURE;
   }
 
   FT_Error status;
   FT_ULong len = 0;
-  status = FT_Load_Sfnt_Table(face, aTableTag, 0, nullptr, &len);
+  status = FT_Load_Sfnt_Table(face->GetFace(), aTableTag, 0, nullptr, &len);
   if (status != FT_Err_Ok || len == 0) {
     return NS_ERROR_FAILURE;
   }
@@ -576,19 +466,17 @@
     return NS_ERROR_OUT_OF_MEMORY;
   }
   uint8_t* buf = aBuffer.Elements();
-  status = FT_Load_Sfnt_Table(face, aTableTag, 0, buf, &len);
+  status = FT_Load_Sfnt_Table(face->GetFace(), aTableTag, 0, buf, &len);
   NS_ENSURE_TRUE(status == FT_Err_Ok, NS_ERROR_FAILURE);
 
   return NS_OK;
 }
 
 hb_blob_t* FT2FontEntry::GetFontTable(uint32_t aTableTag) {
-  if (mFontFace) {
+  if (FTUserFontData* userFontData = GetUserFontData()) {
     // if there's a cairo font face, we may be able to return a blob
     // that just wraps a range of the attached user font data
-    FTUserFontData* userFontData = static_cast<FTUserFontData*>(
-        cairo_font_face_get_user_data(mFontFace, &sFTUserFontDataKey));
-    if (userFontData && userFontData->FontData()) {
+    if (userFontData->FontData()) {
       return gfxFontUtils::GetTableFromFontData(userFontData->FontData(),
                                                 aTableTag);
     }
@@ -605,9 +493,10 @@
   }
   mHasVariationsInitialized = true;
 
-  AutoFTFace face(this);
+  RefPtr<SharedFTFace> face = GetFTFace();
   if (face) {
-    mHasVariations = FT_Face(face)->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS;
+    mHasVariations =
+        face->GetFace()->face_flags & FT_FACE_FLAG_MULTIPLE_MASTERS;
   }
 
   return mHasVariations;
@@ -641,11 +530,11 @@
     return mMMVar;
   }
   mMMVarInitialized = true;
-  AutoFTFace face(this);
+  RefPtr<SharedFTFace> face = GetFTFace(true);
   if (!face) {
     return nullptr;
   }
-  if (FT_Err_Ok != FT_Get_MM_Var(face, &mMMVar)) {
+  if (FT_Err_Ok != FT_Get_MM_Var(face->GetFace(), &mMMVar)) {
     mMMVar = nullptr;
   }
   return mMMVar;
@@ -1162,10 +1051,10 @@
   // Droid Sans Arabic from certain phones, as identified by the
   // font checksum in the 'head' table
   if (aFamilyKey.EqualsLiteral("droid sans arabic")) {
-    AutoFTFace face(this);
+    RefPtr<SharedFTFace> face = GetFTFace();
     if (face) {
-      const TT_Header* head =
-          static_cast<const TT_Header*>(FT_Get_Sfnt_Table(face, ft_sfnt_head));
+      const TT_Header* head = static_cast<const TT_Header*>(
+          FT_Get_Sfnt_Table(face->GetFace(), ft_sfnt_head));
       if (head && head->CheckSum_Adjust == 0xe445242) {
         mIgnoreGSUB = true;
       }
@@ -1739,14 +1628,14 @@
   // from the userfont entry rather than the actual font.
 
   // Ensure existence of mFTFace in the original entry
-  fontEntry->CairoFontFace();
-  if (!fontEntry->mFTFace) {
+  RefPtr<SharedFTFace> face = fontEntry->GetFTFace(true);
+  if (!face) {
     return nullptr;
   }
 
-  FT2FontEntry* fe = FT2FontEntry::CreateFontEntry(
-      fontEntry->mFTFace, fontEntry->mFilename.get(), fontEntry->mFTFontIndex,
-      fontEntry->Name(), nullptr);
+  FT2FontEntry* fe =
+      FT2FontEntry::CreateFontEntry(face->GetFace(), fontEntry->mFilename.get(),
+                                    fontEntry->mFTFontIndex, fontEntry->Name());
   if (fe) {
     fe->mStyleRange = aStyleForEntry;
     fe->mWeightRange = aWeightForEntry;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2FontList.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2FontList.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2FontList.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2FontList.h	2019-09-15 11:33:11.000000000 +0000
@@ -21,14 +21,12 @@
 typedef struct FT_FaceRec_* FT_Face;
 class nsZipArchive;
 class WillShutdownObserver;
+class FTUserFontData;
 
 class FT2FontEntry : public gfxFontEntry {
  public:
   explicit FT2FontEntry(const nsACString& aFaceName)
-      : gfxFontEntry(aFaceName),
-        mFTFace(nullptr),
-        mFontFace(nullptr),
-        mFTFontIndex(0) {}
+      : gfxFontEntry(aFaceName), mFTFontIndex(0) {}
 
   ~FT2FontEntry();
 
@@ -51,22 +49,16 @@
   // aFontData (if non-nullptr) is NS_Malloc'ed data that aFace depends on,
   // to be freed after the face is destroyed.
   // aLength is the length of aFontData.
-  static FT2FontEntry* CreateFontEntry(FT_Face aFace, const char* aFilename,
-                                       uint8_t aIndex, const nsACString& aName,
-                                       const uint8_t* aFontData = nullptr,
-                                       uint32_t aLength = 0);
+  static FT2FontEntry* CreateFontEntry(FT_Face, const char* aFilename,
+                                       uint8_t aIndex, const nsACString& aName);
 
-  gfxFont* CreateFontInstance(const gfxFontStyle* aFontStyle) override;
-
-  // Create (if necessary) and return the cairo_font_face for this font.
-  // This may fail and return null, so caller must be prepared to handle this.
-  // If a style is passed, any variationSettings in the style will be applied
-  // to the resulting font face.
-  cairo_font_face_t* CairoFontFace(const gfxFontStyle* aStyle = nullptr);
+  gfxFont* CreateFontInstance(const gfxFontStyle* aStyle) override;
 
   // Create a cairo_scaled_font for this face, with the given style.
   // This may fail and return null, so caller must be prepared to handle this.
-  cairo_scaled_font_t* CreateScaledFont(const gfxFontStyle* aStyle);
+  cairo_scaled_font_t* CreateScaledFont(
+      const gfxFontStyle* aStyle, RefPtr<mozilla::gfx::SharedFTFace> aFace,
+      int* aOutLoadFlags, unsigned int* aOutSynthFlags);
 
   nsresult ReadCMAP(FontInfoData* aFontInfoData = nullptr) override;
 
@@ -86,6 +78,9 @@
   void CheckForBrokenFont(gfxFontFamily* aFamily);
   void CheckForBrokenFont(const nsACString& aFamilyKey);
 
+  already_AddRefed<mozilla::gfx::SharedFTFace> GetFTFace(bool aCommit = false);
+  FTUserFontData* GetUserFontData();
+
   FT_MM_Var* GetMMVar() override;
 
   /**
@@ -103,8 +98,7 @@
   void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf,
                               FontListSizes* aSizes) const override;
 
-  FT_Face mFTFace;
-  cairo_font_face_t* mFontFace;
+  RefPtr<mozilla::gfx::SharedFTFace> mFTFace;
 
   FT_MM_Var* mMMVar = nullptr;
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2Fonts.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2Fonts.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2Fonts.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2Fonts.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -153,27 +153,25 @@
 }
 
 gfxFT2Font::gfxFT2Font(const RefPtr<UnscaledFontFreeType>& aUnscaledFont,
-                       cairo_scaled_font_t* aCairoFont, FT_Face aFTFace,
-                       FT2FontEntry* aFontEntry, const gfxFontStyle* aFontStyle)
-    : gfxFT2FontBase(aUnscaledFont, aCairoFont, aFontEntry, aFontStyle),
-      mCharGlyphCache(32),
-      mFTFace(aFTFace) {
+                       cairo_scaled_font_t* aCairoFont,
+                       RefPtr<mozilla::gfx::SharedFTFace>&& aFTFace,
+                       FT2FontEntry* aFontEntry, const gfxFontStyle* aFontStyle,
+                       int aLoadFlags, bool aEmbolden)
+    : gfxFT2FontBase(aUnscaledFont, aCairoFont, std::move(aFTFace), aFontEntry,
+                     aFontStyle, aLoadFlags, aEmbolden),
+      mCharGlyphCache(32) {
   NS_ASSERTION(mFontEntry,
                "Unable to find font entry for font.  Something is whack.");
-  // TODO: use FreeType emboldening instead of multi-strike?
-  mApplySyntheticBold = aFontStyle->NeedsSyntheticBold(aFontEntry);
+  InitMetrics();
 }
 
 gfxFT2Font::~gfxFT2Font() {}
 
 already_AddRefed<ScaledFont> gfxFT2Font::GetScaledFont(DrawTarget* aTarget) {
   if (!mAzureScaledFont) {
-    NativeFont nativeFont;
-    nativeFont.mType = NativeFontType::FREETYPE_FACE;
-    nativeFont.mFont = mFTFace;
-
-    mAzureScaledFont = Factory::CreateScaledFontForNativeFont(
-        nativeFont, GetUnscaledFont(), GetAdjustedSize(), GetCairoScaledFont());
+    mAzureScaledFont = Factory::CreateScaledFontForFreeTypeFont(
+        GetUnscaledFont(), GetAdjustedSize(), GetCairoScaledFont(), mFTFace,
+        GetStyle()->NeedsSyntheticBold(GetFontEntry()));
     InitializeScaledFont();
   }
 
@@ -181,6 +179,10 @@
   return scaledFont.forget();
 }
 
+bool gfxFT2Font::ShouldHintMetrics() const {
+  return !gfxPlatform::GetPlatform()->RequiresLinearZoom();
+}
+
 void gfxFT2Font::FillGlyphDataForChar(FT_Face face, uint32_t ch,
                                       CachedGlyphData* gd) {
   if (!face->charmap || (face->charmap->encoding != FT_ENCODING_UNICODE &&
@@ -201,13 +203,7 @@
     return;
   }
 
-  FT_Int32 flags = gfxPlatform::GetPlatform()->FontHintingEnabled()
-                       ? FT_LOAD_DEFAULT
-                       : (FT_LOAD_NO_AUTOHINT | FT_LOAD_NO_HINTING);
-  if (face->face_flags & FT_FACE_FLAG_TRICKY) {
-    flags &= ~FT_LOAD_NO_AUTOHINT;
-  }
-  FT_Error err = Factory::LoadFTGlyph(face, gid, flags);
+  FT_Error err = Factory::LoadFTGlyph(face, gid, mFTLoadFlags);
 
   if (err) {
     // hmm, this is weird, we failed to load a glyph that we had?
@@ -220,7 +216,8 @@
   gd->glyphIndex = gid;
   gd->lsbDelta = face->glyph->lsb_delta;
   gd->rsbDelta = face->glyph->rsb_delta;
-  gd->xAdvance = face->glyph->advance.x;
+  gd->xAdvance =
+      face->glyph->advance.x + GetEmboldenAdvance(face, face->glyph->advance.x);
 }
 
 void gfxFT2Font::AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2Fonts.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2Fonts.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2Fonts.h	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2Fonts.h	2019-09-15 11:33:10.000000000 +0000
@@ -20,8 +20,10 @@
 class gfxFT2Font : public gfxFT2FontBase {
  public:  // new functions
   gfxFT2Font(const RefPtr<mozilla::gfx::UnscaledFontFreeType>& aUnscaledFont,
-             cairo_scaled_font_t* aCairoFont, FT_Face aFTFace,
-             FT2FontEntry* aFontEntry, const gfxFontStyle* aFontStyle);
+             cairo_scaled_font_t* aCairoFont,
+             RefPtr<mozilla::gfx::SharedFTFace>&& aFTFace,
+             FT2FontEntry* aFontEntry, const gfxFontStyle* aFontStyle,
+             int aLoadFlags, bool aEmbolden);
   virtual ~gfxFT2Font();
 
   FT2FontEntry* GetFontEntry();
@@ -29,6 +31,8 @@
   already_AddRefed<mozilla::gfx::ScaledFont> GetScaledFont(
       DrawTarget* aTarget) override;
 
+  bool ShouldHintMetrics() const override;
+
   void AddSizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf,
                               FontCacheSizes* aSizes) const override;
   void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf,
@@ -73,7 +77,6 @@
       CharGlyphMapEntryType;
   typedef nsTHashtable<CharGlyphMapEntryType> CharGlyphMap;
   CharGlyphMap mCharGlyphCache;
-  FT_Face mFTFace;
 };
 
 #endif /* GFX_FT2FONTS_H */
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2Utils.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2Utils.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxFT2Utils.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxFT2Utils.h	2019-09-15 11:33:11.000000000 +0000
@@ -29,11 +29,10 @@
 class MOZ_STACK_CLASS gfxFT2LockedFace {
  public:
   explicit gfxFT2LockedFace(gfxFT2FontBase* aFont)
-      : mGfxFont(aFont),
-        mFace(cairo_ft_scaled_font_lock_face(aFont->GetCairoScaledFont())) {}
+      : mGfxFont(aFont), mFace(aFont->LockFTFace()) {}
   ~gfxFT2LockedFace() {
     if (mFace) {
-      cairo_ft_scaled_font_unlock_face(mGfxFont->GetCairoScaledFont());
+      mGfxFont->UnlockFTFace();
     }
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxGDIFont.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxGDIFont.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxGDIFont.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxGDIFont.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -88,14 +88,6 @@
     return false;
   }
 
-  // Ensure the cairo font is set up, so there's no risk it'll fall back to
-  // creating a "toy" font internally (see bug 544617).
-  // We must check that this succeeded, otherwise we risk cairo creating the
-  // wrong kind of font internally as a fallback (bug 744480).
-  if (!SetupCairoFont(aDrawTarget)) {
-    return false;
-  }
-
   return gfxFont::ShapeText(aDrawTarget, aText, aOffset, aLength, aScript,
                             aVertical, aRounding, aShapedText);
 }
@@ -104,17 +96,6 @@
 
 uint32_t gfxGDIFont::GetSpaceGlyph() { return mSpaceGlyph; }
 
-bool gfxGDIFont::SetupCairoFont(DrawTarget* aDrawTarget) {
-  if (!mScaledFont ||
-      cairo_scaled_font_status(mScaledFont) != CAIRO_STATUS_SUCCESS) {
-    // Don't cairo_set_scaled_font as that would propagate the error to
-    // the cairo_t, precluding any further drawing.
-    return false;
-  }
-  cairo_set_scaled_font(gfxFont::RefCairo(aDrawTarget), mScaledFont);
-  return true;
-}
-
 already_AddRefed<ScaledFont> gfxGDIFont::GetScaledFont(DrawTarget* aTarget) {
   if (!mAzureScaledFont) {
     NativeFont nativeFont;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxGDIFont.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxGDIFont.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxGDIFont.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxGDIFont.h	2019-09-15 11:33:11.000000000 +0000
@@ -30,8 +30,6 @@
   /* overrides for the pure virtual methods in gfxFont */
   uint32_t GetSpaceGlyph() override;
 
-  bool SetupCairoFont(DrawTarget* aDrawTarget) override;
-
   already_AddRefed<mozilla::gfx::ScaledFont> GetScaledFont(
       DrawTarget* aTarget) override;
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxGlyphExtents.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxGlyphExtents.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxGlyphExtents.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxGlyphExtents.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -47,13 +47,11 @@
       return false;
     }
 
-    if (aFont->SetupCairoFont(aDrawTarget)) {
 #ifdef DEBUG_TEXT_RUN_STORAGE_METRICS
-      ++gGlyphExtentsSetupLazyTight;
+    ++gGlyphExtentsSetupLazyTight;
 #endif
-      aFont->SetupGlyphExtents(aDrawTarget, aGlyphID, true, this);
-      entry = mTightGlyphExtents.GetEntry(aGlyphID);
-    }
+    aFont->SetupGlyphExtents(aDrawTarget, aGlyphID, true, this);
+    entry = mTightGlyphExtents.GetEntry(aGlyphID);
     if (!entry) {
       NS_WARNING("Could not get glyph extents");
       return false;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxGraphiteShaper.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxGraphiteShaper.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxGraphiteShaper.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxGraphiteShaper.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -80,11 +80,6 @@
                                   uint32_t aLength, Script aScript,
                                   bool aVertical, RoundingFlags aRounding,
                                   gfxShapedText* aShapedText) {
-  // some font back-ends require this in order to get proper hinted metrics
-  if (!mFont->SetupCairoFont(aDrawTarget)) {
-    return false;
-  }
-
   const gfxFontStyle* style = mFont->GetStyle();
 
   if (!mGrFont) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxHarfBuzzShaper.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxHarfBuzzShaper.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxHarfBuzzShaper.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxHarfBuzzShaper.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -1319,11 +1319,6 @@
                                   uint32_t aLength, Script aScript,
                                   bool aVertical, RoundingFlags aRounding,
                                   gfxShapedText* aShapedText) {
-  // some font back-ends require this in order to get proper hinted metrics
-  if (!mFont->SetupCairoFont(aDrawTarget)) {
-    return false;
-  }
-
   mUseVerticalPresentationForms = false;
 
   if (!Initialize()) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxMacFont.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxMacFont.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxMacFont.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxMacFont.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -230,16 +230,6 @@
                             aVertical, aRounding, aShapedText);
 }
 
-bool gfxMacFont::SetupCairoFont(DrawTarget* aDrawTarget) {
-  if (cairo_scaled_font_status(mScaledFont) != CAIRO_STATUS_SUCCESS) {
-    // Don't cairo_set_scaled_font as that would propagate the error to
-    // the cairo_t, precluding any further drawing.
-    return false;
-  }
-  cairo_set_scaled_font(gfxFont::RefCairo(aDrawTarget), mScaledFont);
-  return true;
-}
-
 gfxFont::RunMetrics gfxMacFont::Measure(const gfxTextRun* aTextRun,
                                         uint32_t aStart, uint32_t aEnd,
                                         BoundingBoxType aBoundingBoxType,
@@ -581,6 +571,12 @@
   return scaledFont.forget();
 }
 
+bool gfxMacFont::ShouldRoundXOffset(cairo_t* aCairo) const {
+  // Quartz surfaces implement show_glyphs for Quartz fonts
+  return aCairo && cairo_surface_get_type(cairo_get_target(aCairo)) !=
+                       CAIRO_SURFACE_TYPE_QUARTZ;
+}
+
 void gfxMacFont::AddSizeOfExcludingThis(MallocSizeOf aMallocSizeOf,
                                         FontCacheSizes* aSizes) const {
   gfxFont::AddSizeOfExcludingThis(aMallocSizeOf, aSizes);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxMacFont.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxMacFont.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxMacFont.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxMacFont.h	2019-09-15 11:33:11.000000000 +0000
@@ -27,8 +27,6 @@
   /* overrides for the pure virtual methods in gfxFont */
   uint32_t GetSpaceGlyph() override { return mSpaceGlyph; }
 
-  bool SetupCairoFont(DrawTarget* aDrawTarget) override;
-
   /* override Measure to add padding for antialiasing */
   RunMetrics Measure(const gfxTextRun* aTextRun, uint32_t aStart, uint32_t aEnd,
                      BoundingBoxType aBoundingBoxType, DrawTarget* aDrawTargetForTightBoundingBox,
@@ -46,6 +44,8 @@
   already_AddRefed<mozilla::gfx::ScaledFont> GetScaledFont(
       mozilla::gfx::DrawTarget* aTarget) override;
 
+  bool ShouldRoundXOffset(cairo_t* aCairo) const override;
+
   void AddSizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf,
                               FontCacheSizes* aSizes) const override;
   void AddSizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxPlatform.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxPlatform.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxPlatform.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxPlatform.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -1013,10 +1013,6 @@
 
   gPlatform->ComputeTileSize();
 
-#ifdef MOZ_ENABLE_FREETYPE
-  Factory::SetFTLibrary(gPlatform->GetFTLibrary());
-#endif
-
   gPlatform->mHasVariationFontSupport = gPlatform->CheckVariationFontSupport();
 
   nsresult rv;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxPlatformFontList.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxPlatformFontList.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxPlatformFontList.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxPlatformFontList.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -400,6 +400,13 @@
 
   gfxPlatform::PurgeSkiaFontCache();
 
+  nsCOMPtr<nsIObserverService> obs = mozilla::services::GetObserverService();
+  if (obs) {
+    // Notify any current presContexts that fonts are being updated, so existing
+    // caches will no longer be valid.
+    obs->NotifyObservers(nullptr, "font-info-updated", nullptr);
+  }
+
   mAliasTable.Clear();
   mLocalNameTable.Clear();
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxPlatformGtk.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxPlatformGtk.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxPlatformGtk.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxPlatformGtk.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -72,6 +72,8 @@
 using namespace mozilla::unicode;
 using mozilla::dom::SystemFontListEntry;
 
+static FT_Library gPlatformFTLibrary = nullptr;
+
 gfxPlatformGtk::gfxPlatformGtk() {
   if (!gfxPlatform::IsHeadless()) {
     gtk_init(nullptr, nullptr);
@@ -105,6 +107,10 @@
   // Set default display fps to 60
   mWaylandFrameDelay = 1000 / 60;
 #endif
+
+  gPlatformFTLibrary = Factory::NewFTLibrary();
+  MOZ_ASSERT(gPlatformFTLibrary);
+  Factory::SetFTLibrary(gPlatformFTLibrary);
 }
 
 gfxPlatformGtk::~gfxPlatformGtk() {
@@ -113,6 +119,9 @@
     XCloseDisplay(mCompositorDisplay);
   }
 #endif  // MOZ_X11
+
+  Factory::ReleaseFTLibrary(gPlatformFTLibrary);
+  gPlatformFTLibrary = nullptr;
 }
 
 void gfxPlatformGtk::FlushContentDrawing() {
@@ -264,10 +273,6 @@
                           aDevToCssSize);
 }
 
-FT_Library gfxPlatformGtk::GetFTLibrary() {
-  return gfxFcPlatformFontList::GetFTLibrary();
-}
-
 static int32_t sDPI = 0;
 
 int32_t gfxPlatformGtk::GetFontScaleDPI() {
@@ -468,7 +473,7 @@
   // in older versions, it seems too incomplete/unstable for us to use
   // until at least 2.7.1.
   FT_Int major, minor, patch;
-  FT_Library_Version(GetFTLibrary(), &major, &minor, &patch);
+  FT_Library_Version(Factory::GetFTLibrary(), &major, &minor, &patch);
   return major * 1000000 + minor * 1000 + patch >= 2007001;
 }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxPlatformGtk.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxPlatformGtk.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxPlatformGtk.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxPlatformGtk.h	2019-09-15 11:33:11.000000000 +0000
@@ -58,8 +58,6 @@
    */
   void FlushContentDrawing() override;
 
-  FT_Library GetFTLibrary() override;
-
   static int32_t GetFontScaleDPI();
   static double GetFontScaleFactor();
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxPlatform.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxPlatform.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/thebes/gfxPlatform.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/thebes/gfxPlatform.h	2019-09-15 11:33:11.000000000 +0000
@@ -720,8 +720,6 @@
    */
   virtual void ImportGPUDeviceData(const mozilla::gfx::GPUDeviceData& aData);
 
-  virtual FT_Library GetFTLibrary() { return nullptr; }
-
   bool HasVariationFontSupport() const { return mHasVariationFontSupport; }
 
   bool HasNativeColrFontSupport() const { return mHasNativeColrFontSupport; }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/webrender_bindings/src/bindings.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/webrender_bindings/src/bindings.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/webrender_bindings/src/bindings.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/webrender_bindings/src/bindings.rs	2019-09-15 11:33:11.000000000 +0000
@@ -2570,8 +2570,6 @@
                                    clip: LayoutRect,
                                    is_backface_visible: bool,
                                    parent: &WrSpaceAndClipChain,
-                                   stretch_size: LayoutSize,
-                                   tile_spacing: LayoutSize,
                                    image_rendering: ImageRendering,
                                    key: WrImageKey,
                                    premultiplied_alpha: bool,
@@ -2598,14 +2596,54 @@
          .dl_builder
          .push_image(&prim_info,
                      bounds,
-                     stretch_size,
-                     tile_spacing,
                      image_rendering,
                      alpha_type,
                      key,
                      color);
 }
 
+#[no_mangle]
+pub extern "C" fn wr_dp_push_repeating_image(state: &mut WrState,
+                                             bounds: LayoutRect,
+                                             clip: LayoutRect,
+                                             is_backface_visible: bool,
+                                             parent: &WrSpaceAndClipChain,
+                                             stretch_size: LayoutSize,
+                                             tile_spacing: LayoutSize,
+                                             image_rendering: ImageRendering,
+                                             key: WrImageKey,
+                                             premultiplied_alpha: bool,
+                                             color: ColorF) {
+    debug_assert!(unsafe { is_in_main_thread() || is_in_compositor_thread() });
+
+    let space_and_clip = parent.to_webrender(state.pipeline_id);
+
+    let prim_info = CommonItemProperties {
+        clip_rect: clip,
+        clip_id: space_and_clip.clip_id,
+        spatial_id: space_and_clip.spatial_id,
+        is_backface_visible,
+        hit_info: state.current_tag,
+    };
+
+    let alpha_type = if premultiplied_alpha {
+        AlphaType::PremultipliedAlpha
+    } else {
+        AlphaType::Alpha
+    };
+
+    state.frame_builder
+         .dl_builder
+         .push_repeating_image(&prim_info,
+                               bounds,
+                               stretch_size,
+                               tile_spacing,
+                               image_rendering,
+                               alpha_type,
+                               key,
+                               color);
+}
+
 /// Push a 3 planar yuv image.
 #[no_mangle]
 pub extern "C" fn wr_dp_push_yuv_planar_image(state: &mut WrState,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/webrender_bindings/WebRenderAPI.cpp firefox-trunk-71.0~a1~hg20190915r493291/gfx/webrender_bindings/WebRenderAPI.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/webrender_bindings/WebRenderAPI.cpp	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/webrender_bindings/WebRenderAPI.cpp	2019-09-15 11:33:10.000000000 +0000
@@ -1091,14 +1091,15 @@
     const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip,
     bool aIsBackfaceVisible, wr::ImageRendering aFilter, wr::ImageKey aImage,
     bool aPremultipliedAlpha, const wr::ColorF& aColor) {
-  wr::LayoutSize size;
-  size.width = aBounds.size.width;
-  size.height = aBounds.size.height;
-  PushImage(aBounds, aClip, aIsBackfaceVisible, size, size, aFilter, aImage,
-            aPremultipliedAlpha, aColor);
+  wr::LayoutRect clip = MergeClipLeaf(aClip);
+  WRDL_LOG("PushImage b=%s cl=%s\n", mWrState, Stringify(aBounds).c_str(),
+           Stringify(clip).c_str());
+  wr_dp_push_image(mWrState, aBounds, clip, aIsBackfaceVisible,
+                   &mCurrentSpaceAndClipChain, aFilter, aImage,
+                   aPremultipliedAlpha, aColor);
 }
 
-void DisplayListBuilder::PushImage(
+void DisplayListBuilder::PushRepeatingImage(
     const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip,
     bool aIsBackfaceVisible, const wr::LayoutSize& aStretchSize,
     const wr::LayoutSize& aTileSpacing, wr::ImageRendering aFilter,
@@ -1107,9 +1108,9 @@
   WRDL_LOG("PushImage b=%s cl=%s s=%s t=%s\n", mWrState,
            Stringify(aBounds).c_str(), Stringify(clip).c_str(),
            Stringify(aStretchSize).c_str(), Stringify(aTileSpacing).c_str());
-  wr_dp_push_image(mWrState, aBounds, clip, aIsBackfaceVisible,
-                   &mCurrentSpaceAndClipChain, aStretchSize, aTileSpacing,
-                   aFilter, aImage, aPremultipliedAlpha, aColor);
+  wr_dp_push_repeating_image(
+      mWrState, aBounds, clip, aIsBackfaceVisible, &mCurrentSpaceAndClipChain,
+      aStretchSize, aTileSpacing, aFilter, aImage, aPremultipliedAlpha, aColor);
 }
 
 void DisplayListBuilder::PushYCbCrPlanarImage(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/webrender_bindings/WebRenderAPI.h firefox-trunk-71.0~a1~hg20190915r493291/gfx/webrender_bindings/WebRenderAPI.h
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/webrender_bindings/WebRenderAPI.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/webrender_bindings/WebRenderAPI.h	2019-09-15 11:33:10.000000000 +0000
@@ -479,11 +479,12 @@
                  wr::ImageKey aImage, bool aPremultipliedAlpha = true,
                  const wr::ColorF& aColor = wr::ColorF{1.0f, 1.0f, 1.0f, 1.0f});
 
-  void PushImage(const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip,
-                 bool aIsBackfaceVisible, const wr::LayoutSize& aStretchSize,
-                 const wr::LayoutSize& aTileSpacing, wr::ImageRendering aFilter,
-                 wr::ImageKey aImage, bool aPremultipliedAlpha = true,
-                 const wr::ColorF& aColor = wr::ColorF{1.0f, 1.0f, 1.0f, 1.0f});
+  void PushRepeatingImage(
+      const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip,
+      bool aIsBackfaceVisible, const wr::LayoutSize& aStretchSize,
+      const wr::LayoutSize& aTileSpacing, wr::ImageRendering aFilter,
+      wr::ImageKey aImage, bool aPremultipliedAlpha = true,
+      const wr::ColorF& aColor = wr::ColorF{1.0f, 1.0f, 1.0f, 1.0f});
 
   void PushYCbCrPlanarImage(
       const wr::LayoutRect& aBounds, const wr::LayoutRect& aClip,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/examples/blob.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/examples/blob.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/examples/blob.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/examples/blob.rs	2019-09-15 11:33:11.000000000 +0000
@@ -236,8 +236,6 @@
         builder.push_image(
             &CommonItemProperties::new(bounds, space_and_clip),
             bounds,
-            LayoutSize::new(500.0, 500.0),
-            LayoutSize::new(0.0, 0.0),
             api::ImageRendering::Auto,
             api::AlphaType::PremultipliedAlpha,
             blob_img1.as_image(),
@@ -248,8 +246,6 @@
         builder.push_image(
             &CommonItemProperties::new(bounds, space_and_clip),
             bounds,
-            LayoutSize::new(200.0, 200.0),
-            LayoutSize::new(0.0, 0.0),
             api::ImageRendering::Auto,
             api::AlphaType::PremultipliedAlpha,
             blob_img2.as_image(),
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/examples/frame_output.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/examples/frame_output.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/examples/frame_output.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/examples/frame_output.rs	2019-09-15 11:33:11.000000000 +0000
@@ -170,8 +170,6 @@
         builder.push_image(
             &CommonItemProperties::new(bounds, space_and_clip),
             bounds,
-            bounds.size,
-            LayoutSize::zero(),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             self.external_image_key.unwrap(),
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/examples/image_resize.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/examples/image_resize.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/examples/image_resize.rs	2019-09-13 05:13:14.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/examples/image_resize.rs	2019-09-15 11:33:10.000000000 +0000
@@ -55,8 +55,6 @@
                 space_and_clip,
             ),
             bounds,
-            image_size,
-            LayoutSize::zero(),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             self.image_key,
@@ -69,8 +67,6 @@
                 space_and_clip,
             ),
             bounds,
-            image_size,
-            LayoutSize::zero(),
             ImageRendering::Pixelated,
             AlphaType::PremultipliedAlpha,
             self.image_key,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/examples/texture_cache_stress.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/examples/texture_cache_stress.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/examples/texture_cache_stress.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/examples/texture_cache_stress.rs	2019-09-15 11:33:11.000000000 +0000
@@ -147,8 +147,6 @@
             builder.push_image(
                 &info,
                 bounds,
-                image_size,
-                LayoutSize::zero(),
                 ImageRendering::Auto,
                 AlphaType::PremultipliedAlpha,
                 *key,
@@ -165,8 +163,6 @@
             builder.push_image(
                 &info,
                 bounds,
-                image_size,
-                LayoutSize::zero(),
                 ImageRendering::Auto,
                 AlphaType::PremultipliedAlpha,
                 image_key,
@@ -183,8 +179,6 @@
         builder.push_image(
             &info,
             bounds,
-            image_size,
-            LayoutSize::zero(),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             swap_key,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/brush.glsl firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/brush.glsl
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/brush.glsl	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/brush.glsl	2019-09-15 11:33:11.000000000 +0000
@@ -70,9 +70,7 @@
             ph.local_clip_rect,
             ph.z,
             transform,
-            pic_task,
-            ph.local_rect,
-            ph.snap_offsets
+            pic_task
         );
 
         // TODO(gw): transform bounds may be referenced by
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/clip_shared.glsl firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/clip_shared.glsl
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/clip_shared.glsl	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/clip_shared.glsl	2019-09-15 11:33:11.000000000 +0000
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include rect,render_task,gpu_cache,snap,transform
+#include rect,render_task,gpu_cache,transform
 
 #ifdef WR_VERTEX_SHADER
 
@@ -11,7 +11,6 @@
 in vec2 aClipLocalPos;
 in vec4 aClipTileRect;
 in vec4 aClipDeviceArea;
-in vec4 aClipSnapOffsets;
 in vec4 aClipOrigins;
 in float aDevicePixelScale;
 
@@ -23,7 +22,6 @@
     vec2 local_pos;
     RectWithSize tile_rect;
     RectWithSize sub_rect;
-    vec4 snap_offsets;
     vec2 task_origin;
     vec2 screen_origin;
     float device_pixel_scale;
@@ -39,7 +37,6 @@
     cmi.local_pos = aClipLocalPos;
     cmi.tile_rect = RectWithSize(aClipTileRect.xy, aClipTileRect.zw);
     cmi.sub_rect = RectWithSize(aClipDeviceArea.xy, aClipDeviceArea.zw);
-    cmi.snap_offsets = aClipSnapOffsets;
     cmi.task_origin = aClipOrigins.xy;
     cmi.screen_origin = aClipOrigins.zw;
     cmi.device_pixel_scale = aDevicePixelScale;
@@ -64,23 +61,10 @@
                                       Transform prim_transform,
                                       Transform clip_transform,
                                       RectWithSize sub_rect,
-                                      vec4 snap_offsets,
                                       vec2 task_origin,
                                       vec2 screen_origin,
                                       float device_pixel_scale) {
     vec2 device_pos = screen_origin + sub_rect.p0 + aPosition.xy * sub_rect.size;
-
-    // If the primitive we are drawing a clip mask for was snapped, then
-    // remove the effect of that snapping, so that the local position
-    // interpolation below works correctly relative to the clip item.
-    vec2 snap_offset = mix(
-        snap_offsets.xy,
-        snap_offsets.zw,
-        aPosition.xy
-    );
-
-    device_pos -= snap_offset;
-
     vec2 world_pos = device_pos / device_pixel_scale;
 
     vec4 pos = prim_transform.m * vec4(world_pos, 0.0, 1.0);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/cs_clip_box_shadow.glsl firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/cs_clip_box_shadow.glsl
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/cs_clip_box_shadow.glsl	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/cs_clip_box_shadow.glsl	2019-09-15 11:33:11.000000000 +0000
@@ -52,7 +52,6 @@
         prim_transform,
         clip_transform,
         cmi.sub_rect,
-        cmi.snap_offsets,
         cmi.task_origin,
         cmi.screen_origin,
         cmi.device_pixel_scale
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/cs_clip_image.glsl firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/cs_clip_image.glsl
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/cs_clip_image.glsl	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/cs_clip_image.glsl	2019-09-15 11:33:11.000000000 +0000
@@ -35,7 +35,6 @@
         prim_transform,
         clip_transform,
         cmi.sub_rect,
-        cmi.snap_offsets,
         cmi.task_origin,
         cmi.screen_origin,
         cmi.device_pixel_scale
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/cs_clip_rectangle.glsl firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/cs_clip_rectangle.glsl
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/cs_clip_rectangle.glsl	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/cs_clip_rectangle.glsl	2019-09-15 11:33:11.000000000 +0000
@@ -77,7 +77,6 @@
         prim_transform,
         clip_transform,
         cmi.sub_rect,
-        cmi.snap_offsets,
         cmi.task_origin,
         cmi.screen_origin,
         cmi.device_pixel_scale
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/prim_shared.glsl firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/prim_shared.glsl
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/prim_shared.glsl	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/prim_shared.glsl	2019-09-15 11:33:11.000000000 +0000
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include rect,render_task,gpu_cache,snap,transform
+#include rect,render_task,gpu_cache,transform
 
 #define EXTEND_MODE_CLAMP  0
 #define EXTEND_MODE_REPEAT 1
@@ -47,13 +47,12 @@
 // Instanced attributes
 in ivec4 aData;
 
-#define VECS_PER_PRIM_HEADER_F 3U
+#define VECS_PER_PRIM_HEADER_F 2U
 #define VECS_PER_PRIM_HEADER_I 2U
 
 struct PrimitiveHeader {
     RectWithSize local_rect;
     RectWithSize local_clip_rect;
-    vec4 snap_offsets;
     float z;
     int specific_prim_address;
     int transform_id;
@@ -66,7 +65,6 @@
     ivec2 uv_f = get_fetch_uv(index, VECS_PER_PRIM_HEADER_F);
     vec4 local_rect = TEXEL_FETCH(sPrimitiveHeadersF, uv_f, 0, ivec2(0, 0));
     vec4 local_clip_rect = TEXEL_FETCH(sPrimitiveHeadersF, uv_f, 0, ivec2(1, 0));
-    ph.snap_offsets = TEXEL_FETCH(sPrimitiveHeadersF, uv_f, 0, ivec2(2, 0));
     ph.local_rect = RectWithSize(local_rect.xy, local_rect.zw);
     ph.local_clip_rect = RectWithSize(local_clip_rect.xy, local_clip_rect.zw);
 
@@ -91,9 +89,7 @@
                         RectWithSize local_clip_rect,
                         float z,
                         Transform transform,
-                        PictureTask task,
-                        RectWithSize snap_rect,
-                        vec4 snap_offsets) {
+                        PictureTask task) {
 
     // Select the corner of the local rect that we are processing.
     vec2 local_pos = instance_rect.p0 + instance_rect.size * aPosition.xy;
@@ -101,13 +97,6 @@
     // Clamp to the two local clip rects.
     vec2 clamped_local_pos = clamp_rect(local_pos, local_clip_rect);
 
-    /// Compute the snapping offset.
-    vec2 snap_offset = compute_snap_offset(
-        clamped_local_pos,
-        snap_rect,
-        snap_offsets
-    );
-
     // Transform the current vertex to world space.
     vec4 world_pos = transform.m * vec4(clamped_local_pos, 0.0, 1.0);
 
@@ -115,13 +104,13 @@
     vec2 device_pos = world_pos.xy * task.device_pixel_scale;
 
     // Apply offsets for the render task to get correct screen location.
-    vec2 final_offset = snap_offset - task.content_origin + task.common_data.task_rect.p0;
+    vec2 final_offset = -task.content_origin + task.common_data.task_rect.p0;
 
     gl_Position = uTransform * vec4(device_pos + final_offset * world_pos.w, z * world_pos.w, world_pos.w);
 
     VertexInfo vi = VertexInfo(
         clamped_local_pos,
-        snap_offset,
+        vec2(0.0, 0.0),
         world_pos
     );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/snap.glsl firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/snap.glsl
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/res/snap.glsl	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/res/snap.glsl	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#ifdef WR_VERTEX_SHADER
-
-/// Given a point within a local rectangle, and the device space corners
-/// offsets for the unsnapped primitive, return the snap offsets. This *must*
-/// exactly match the logic in the Rust compute_snap_offset_impl function.
-vec2 compute_snap_offset(
-    vec2 reference_pos,
-    RectWithSize reference_rect,
-    vec4 snap_positions
-) {
-    /// Compute the position of this vertex inside the snap rectangle.
-    vec2 normalized_snap_pos = (reference_pos - reference_rect.p0) / reference_rect.size;
-
-    /// Compute the actual world offset for this vertex needed to make it snap.
-    return mix(snap_positions.xy, snap_positions.zw, normalized_snap_pos);
-}
-
-#endif //WR_VERTEX_SHADER
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/batch.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/batch.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/batch.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/batch.rs	2019-09-15 11:33:11.000000000 +0000
@@ -10,7 +10,7 @@
 use crate::glyph_rasterizer::GlyphFormat;
 use crate::gpu_cache::{GpuBlockData, GpuCache, GpuCacheHandle, GpuCacheAddress};
 use crate::gpu_types::{BrushFlags, BrushInstance, PrimitiveHeaders, ZBufferId, ZBufferIdGenerator};
-use crate::gpu_types::{ClipMaskInstance, SplitCompositeInstance, SnapOffsets};
+use crate::gpu_types::{ClipMaskInstance, SplitCompositeInstance};
 use crate::gpu_types::{PrimitiveInstanceData, RasterizationSpace, GlyphInstance};
 use crate::gpu_types::{PrimitiveHeader, PrimitiveHeaderIndex, TransformPaletteId, TransformPalette};
 use crate::internal_types::{FastHashMap, SavedTargetIndex, Swizzle, TextureSource, Filter};
@@ -18,7 +18,6 @@
 use crate::prim_store::{DeferredResolve, EdgeAaSegmentMask, PrimitiveInstanceKind, PrimitiveVisibilityIndex, PrimitiveVisibilityMask};
 use crate::prim_store::{VisibleGradientTile, PrimitiveInstance, PrimitiveOpacity, SegmentInstanceIndex};
 use crate::prim_store::{BrushSegment, ClipMaskKind, ClipTaskIndex, VECS_PER_SEGMENT};
-use crate::prim_store::{recompute_snap_offsets};
 use crate::prim_store::image::ImageSource;
 use crate::render_backend::DataStores;
 use crate::render_target::RenderTargetContext;
@@ -708,7 +707,7 @@
         let prim_common_data = &ctx.data_stores.as_common_data(&prim_instance);
         let prim_rect = LayoutRect::new(
             prim_instance.prim_origin,
-            prim_common_data.prim_size,
+            prim_common_data.prim_size
         );
 
         let mut batch_features = BatchFeatures::empty();
@@ -720,7 +719,6 @@
             batch_features |= BatchFeatures::ANTIALIASING;
         }
 
-        let snap_offsets = prim_info.snap_offsets;
         let prim_vis_mask = prim_info.visibility_mask;
         let clip_task_address = ctx.get_prim_clip_task_address(
             prim_info.clip_task_index,
@@ -751,7 +749,6 @@
                 let prim_header = PrimitiveHeader {
                     local_rect: prim_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
-                    snap_offsets,
                     specific_prim_address: prim_cache_address,
                     transform_id,
                 };
@@ -818,7 +815,6 @@
                 let prim_header = PrimitiveHeader {
                     local_rect: prim_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
-                    snap_offsets,
                     specific_prim_address: prim_cache_address,
                     transform_id,
                 };
@@ -870,7 +866,6 @@
                 let prim_header = PrimitiveHeader {
                     local_rect: prim_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
-                    snap_offsets,
                     specific_prim_address: prim_cache_address,
                     transform_id,
                 };
@@ -1040,7 +1035,6 @@
                 let prim_header = PrimitiveHeader {
                     local_rect: prim_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
-                    snap_offsets,
                     specific_prim_address: prim_cache_address,
                     transform_id,
                 };
@@ -1077,9 +1071,8 @@
                 let prim_cache_address = gpu_cache.get_address(&ctx.globals.default_image_handle);
 
                 let prim_header = PrimitiveHeader {
-                    local_rect: picture.snapped_local_rect,
+                    local_rect: picture.local_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
-                    snap_offsets,
                     specific_prim_address: prim_cache_address,
                     transform_id,
                 };
@@ -1104,9 +1097,8 @@
                             );
 
                             let prim_header = PrimitiveHeader {
-                                local_rect: pic.snapped_local_rect,
+                                local_rect: pic.local_rect,
                                 local_clip_rect: child_prim_info.combined_local_clip_rect,
-                                snap_offsets,
                                 specific_prim_address: GpuCacheAddress::INVALID,
                                 transform_id: transforms
                                     .get_id(
@@ -1225,7 +1217,6 @@
                                         let prim_header = PrimitiveHeader {
                                             local_rect: local_tile_rect,
                                             local_clip_rect: local_tile_clip_rect,
-                                            snap_offsets: SnapOffsets::empty(),
                                             specific_prim_address: prim_cache_address,
                                             transform_id,
                                         };
@@ -1295,7 +1286,6 @@
                                         let prim_header = PrimitiveHeader {
                                             local_rect: local_tile_rect,
                                             local_clip_rect: local_tile_clip_rect,
-                                            snap_offsets: SnapOffsets::empty(),
                                             specific_prim_address: prim_cache_address,
                                             transform_id,
                                         };
@@ -1412,7 +1402,6 @@
 
                                             let shadow_prim_header = PrimitiveHeader {
                                                 local_rect: shadow_rect,
-                                                snap_offsets: prim_info.shadow_snap_offsets,
                                                 specific_prim_address: shadow_prim_address,
                                                 ..prim_header
                                             };
@@ -1705,9 +1694,8 @@
                                 };
 
                                 let prim_header = PrimitiveHeader {
-                                    local_rect: picture.snapped_local_rect,
+                                    local_rect: picture.local_rect,
                                     local_clip_rect: prim_info.combined_local_clip_rect,
-                                    snap_offsets,
                                     specific_prim_address: prim_cache_address,
                                     transform_id,
                                 };
@@ -1828,7 +1816,6 @@
                 let prim_header = PrimitiveHeader {
                     local_rect: prim_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
-                    snap_offsets,
                     specific_prim_address: prim_cache_address,
                     transform_id,
                 };
@@ -1903,7 +1890,6 @@
                 let prim_header = PrimitiveHeader {
                     local_rect: prim_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
-                    snap_offsets,
                     specific_prim_address: prim_cache_address,
                     transform_id,
                 };
@@ -2013,7 +1999,6 @@
                 let prim_header = PrimitiveHeader {
                     local_rect: prim_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
-                    snap_offsets,
                     specific_prim_address: prim_cache_address,
                     transform_id,
                 };
@@ -2119,7 +2104,6 @@
                     let prim_header = PrimitiveHeader {
                         local_rect: prim_rect,
                         local_clip_rect: prim_info.combined_local_clip_rect,
-                        snap_offsets,
                         specific_prim_address: prim_cache_address,
                         transform_id,
                     };
@@ -2168,7 +2152,6 @@
                         let prim_header = PrimitiveHeader {
                             local_rect: prim_rect,
                             local_clip_rect: image_instance.tight_local_clip_rect,
-                            snap_offsets,
                             specific_prim_address: gpu_cache.get_address(&gpu_handle),
                             transform_id,
                         };
@@ -2212,7 +2195,6 @@
                 let mut prim_header = PrimitiveHeader {
                     local_rect: prim_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
-                    snap_offsets,
                     specific_prim_address: GpuCacheAddress::INVALID,
                     transform_id,
                 };
@@ -2340,7 +2322,6 @@
                 let mut prim_header = PrimitiveHeader {
                     local_rect: prim_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
-                    snap_offsets,
                     specific_prim_address: GpuCacheAddress::INVALID,
                     transform_id,
                 };
@@ -2444,10 +2425,9 @@
                 let prim_cache_address = gpu_cache.get_address(&ctx.globals.default_image_handle);
                 let backdrop_picture = &ctx.prim_store.pictures[backdrop_pic_index.0];
                 let prim_header = PrimitiveHeader {
-                    local_rect: backdrop_picture.snapped_local_rect,
+                    local_rect: backdrop_picture.local_rect,
                     local_clip_rect: prim_info.combined_local_clip_rect,
                     transform_id,
-                    snap_offsets: SnapOffsets::empty(),
                     specific_prim_address: prim_cache_address,
                 };
 
@@ -2668,18 +2648,10 @@
         let user_data = [stops_handle.as_int(gpu_cache), 0, 0, 0];
 
         for tile in visible_tiles {
-            // Adjust the snap offsets for the tile.
-            let snap_offsets = recompute_snap_offsets(
-                tile.local_rect,
-                base_prim_header.local_rect,
-                base_prim_header.snap_offsets,
-            );
-
             let prim_header = PrimitiveHeader {
                 specific_prim_address: gpu_cache.get_address(&tile.handle),
                 local_rect: tile.local_rect,
                 local_clip_rect: tile.local_clip_rect,
-                snap_offsets,
                 ..*base_prim_header
             };
             let prim_header_index = prim_headers.push(&prim_header, z_id, user_data);
@@ -2949,7 +2921,6 @@
             local_pos,
             tile_rect: LayoutRect::zero(),
             sub_rect,
-            snap_offsets: SnapOffsets::empty(),
             task_origin,
             screen_origin,
             device_pixel_scale,
@@ -3075,7 +3046,6 @@
         actual_rect: DeviceIntRect,
         world_rect: &WorldRect,
         device_pixel_scale: DevicePixelScale,
-        snap_offsets: SnapOffsets,
         task_origin: DevicePoint,
         screen_origin: DevicePoint,
     ) {
@@ -3108,7 +3078,6 @@
                     DevicePoint::zero(),
                     actual_rect.size.to_f32(),
                 ),
-                snap_offsets,
                 task_origin,
                 screen_origin,
                 device_pixel_scale: device_pixel_scale.0,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/box_shadow.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/box_shadow.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/box_shadow.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/box_shadow.rs	2019-09-15 11:33:11.000000000 +0000
@@ -98,10 +98,13 @@
 
         // Apply parameters that affect where the shadow rect
         // exists in the local space of the primitive.
-        let shadow_rect = prim_info
-            .rect
-            .translate(*box_offset)
-            .inflate(spread_amount, spread_amount);
+        let shadow_rect = self.snap_rect(
+            &prim_info
+                .rect
+                .translate(*box_offset)
+                .inflate(spread_amount, spread_amount),
+            clip_and_scroll.spatial_node_index,
+        );
 
         // If blur radius is zero, we can use a fast path with
         // no blur applied.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/clip.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/clip.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/clip.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/clip.rs	2019-09-15 11:33:11.000000000 +0000
@@ -1002,9 +1002,9 @@
         }
     }
 
-    pub fn image_mask(image_mask: &ImageMask) -> Self {
+    pub fn image_mask(image_mask: &ImageMask, mask_rect: LayoutRect) -> Self {
         ClipItemKeyKind::ImageMask(
-            image_mask.rect.into(),
+            mask_rect.into(),
             image_mask.image,
             image_mask.repeat,
         )
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/clip_scroll_tree.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/clip_scroll_tree.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/clip_scroll_tree.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/clip_scroll_tree.rs	2019-09-15 11:33:10.000000000 +0000
@@ -441,6 +441,7 @@
     pub fn update_tree(
         &mut self,
         pan: WorldPoint,
+        global_device_pixel_scale: DevicePixelScale,
         scene_properties: &SceneProperties,
     ) {
         if self.spatial_nodes.is_empty() {
@@ -471,7 +472,7 @@
                 None => continue,
             };
 
-            node.update(&mut state, &mut self.coord_systems, scene_properties, &*previous);
+            node.update(&mut state, &mut self.coord_systems, global_device_pixel_scale, scene_properties, &*previous);
 
             if !node.children.is_empty() {
                 node.prepare_state_for_children(&mut state);
@@ -570,12 +571,16 @@
         self.add_spatial_node(node)
     }
 
-    pub fn add_spatial_node(&mut self, node: SpatialNode) -> SpatialNodeIndex {
+    pub fn add_spatial_node(&mut self, mut node: SpatialNode) -> SpatialNodeIndex {
         let index = SpatialNodeIndex::new(self.spatial_nodes.len());
 
         // When the parent node is None this means we are adding the root.
         if let Some(parent_index) = node.parent {
-            self.spatial_nodes[parent_index.0 as usize].add_child(index);
+            let parent_node = &mut self.spatial_nodes[parent_index.0 as usize];
+            parent_node.add_child(index);
+            node.update_snapping(Some(parent_node));
+        } else {
+            node.update_snapping(None);
         }
 
         self.spatial_nodes.push(node);
@@ -640,12 +645,15 @@
                 pt.new_level(format!("ReferenceFrame"));
                 pt.add_item(format!("kind: {:?}", info.kind));
                 pt.add_item(format!("transform_style: {:?}", info.transform_style));
+                pt.add_item(format!("source_transform: {:?}", info.source_transform));
+                pt.add_item(format!("origin_in_parent_reference_frame: {:?}", info.origin_in_parent_reference_frame));
             }
         }
 
         pt.add_item(format!("index: {:?}", index));
         pt.add_item(format!("content_transform: {:?}", node.content_transform));
         pt.add_item(format!("viewport_transform: {:?}", node.viewport_transform));
+        pt.add_item(format!("snapping_transform: {:?}", node.snapping_transform));
         pt.add_item(format!("coordinate_system_id: {:?}", node.coordinate_system_id));
 
         for child_index in &node.children {
@@ -757,7 +765,7 @@
         LayoutVector2D::zero(),
     );
 
-    cst.update_tree(WorldPoint::zero(), &SceneProperties::new());
+    cst.update_tree(WorldPoint::zero(), DevicePixelScale::new(1.0), &SceneProperties::new());
 
     test_pt(100.0, 100.0, &cst, child1, root, 200.0, 100.0);
     test_pt(100.0, 100.0, &cst, child2, root, 200.0, 150.0);
@@ -799,7 +807,7 @@
         LayoutVector2D::zero(),
     );
 
-    cst.update_tree(WorldPoint::zero(), &SceneProperties::new());
+    cst.update_tree(WorldPoint::zero(), DevicePixelScale::new(1.0), &SceneProperties::new());
 
     test_pt(100.0, 100.0, &cst, child1, root, 400.0, 100.0);
     test_pt(100.0, 100.0, &cst, child2, root, 400.0, 200.0);
@@ -849,7 +857,7 @@
         LayoutVector2D::zero(),
     );
 
-    cst.update_tree(WorldPoint::zero(), &SceneProperties::new());
+    cst.update_tree(WorldPoint::zero(), DevicePixelScale::new(1.0), &SceneProperties::new());
 
     test_pt(100.0, 100.0, &cst, child1, root, 200.0, 150.0);
     test_pt(100.0, 100.0, &cst, child2, root, 300.0, 450.0);
@@ -883,7 +891,7 @@
         LayoutVector2D::zero(),
     );
 
-    cst.update_tree(WorldPoint::zero(), &SceneProperties::new());
+    cst.update_tree(WorldPoint::zero(), DevicePixelScale::new(1.0), &SceneProperties::new());
 
     test_pt(100.0, 0.0, &cst, child1, root, 0.0, -100.0);
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/display_list_flattener.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/display_list_flattener.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/display_list_flattener.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/display_list_flattener.rs	2019-09-15 11:33:10.000000000 +0000
@@ -27,6 +27,7 @@
 use crate::prim_store::{ScrollNodeAndClipChain, PictureIndex};
 use crate::prim_store::{InternablePrimitive, SegmentInstanceIndex};
 use crate::prim_store::{register_prim_chase_id, get_line_decoration_sizes};
+use crate::prim_store::{SpaceSnapper};
 use crate::prim_store::backdrop::Backdrop;
 use crate::prim_store::borders::{ImageBorder, NormalBorderPrim};
 use crate::prim_store::gradient::{GradientStopKey, LinearGradient, RadialGradient, RadialGradientParams};
@@ -338,10 +339,13 @@
             found_explicit_tile_cache: false,
         };
 
+        let device_pixel_scale = view.accumulated_scale_factor_for_snapping();
+
         flattener.push_root(
             root_pipeline_id,
             &root_pipeline.viewport_size,
             &root_pipeline.content_size,
+            device_pixel_scale,
         );
 
         // In order to ensure we have a single root stacking context for the
@@ -365,6 +369,7 @@
             ClipChainId::NONE,
             RasterSpace::Screen,
             /* is_backdrop_root = */ true,
+            device_pixel_scale,
         );
 
         flattener.flatten_items(
@@ -935,6 +940,7 @@
             clip_chain_id,
             stacking_context.raster_space,
             stacking_context.is_backdrop_root,
+            self.sc_stack.last().unwrap().snap_to_device.device_pixel_scale,
         );
 
         if cfg!(debug_assertions) && apply_pipeline_clip && clip_chain_id != ClipChainId::NONE {
@@ -992,8 +998,18 @@
         );
         self.pipeline_clip_chain_stack.push(clip_chain_index);
 
-        let bounds = info.bounds;
-        let origin = current_offset + bounds.origin.to_vector();
+        let snap_to_device = &mut self.sc_stack.last_mut().unwrap().snap_to_device;
+        snap_to_device.set_target_spatial_node(
+            spatial_node_index,
+            self.clip_scroll_tree,
+        );
+
+        let bounds = snap_to_device.snap_rect(
+            &info.bounds.translate(current_offset),
+        );
+
+        let content_size = snap_to_device.snap_size(&pipeline.content_size);
+
         let spatial_node_index = self.push_reference_frame(
             SpatialId::root_reference_frame(iframe_pipeline_id),
             Some(spatial_node_index),
@@ -1001,7 +1017,7 @@
             TransformStyle::Flat,
             PropertyBinding::Value(LayoutTransform::identity()),
             ReferenceFrameKind::Transform,
-            origin,
+            bounds.origin.to_vector(),
         );
 
         let iframe_rect = LayoutRect::new(LayoutPoint::zero(), bounds.size);
@@ -1011,7 +1027,7 @@
             Some(ExternalScrollId(0, iframe_pipeline_id)),
             iframe_pipeline_id,
             &iframe_rect,
-            &pipeline.content_size,
+            &content_size,
             ScrollSensitivity::ScriptAndInputEvents,
             ScrollFrameKind::PipelineRoot,
             LayoutVector2D::zero(),
@@ -1055,7 +1071,12 @@
         common: &CommonItemProperties,
         apply_pipeline_clip: bool
     ) -> (LayoutPrimitiveInfo, ScrollNodeAndClipChain) {
-        self.process_common_properties_with_bounds(common, &common.clip_rect, apply_pipeline_clip)
+        let (layout, _, clip_and_scroll) = self.process_common_properties_with_bounds(
+            common,
+            &common.clip_rect,
+            apply_pipeline_clip,
+        );
+        (layout, clip_and_scroll)
     }
 
     fn process_common_properties_with_bounds(
@@ -1063,7 +1084,7 @@
         common: &CommonItemProperties,
         bounds: &LayoutRect,
         apply_pipeline_clip: bool
-    ) -> (LayoutPrimitiveInfo, ScrollNodeAndClipChain) {
+    ) -> (LayoutPrimitiveInfo, LayoutRect, ScrollNodeAndClipChain) {
         let clip_and_scroll = self.get_clip_and_scroll(
             &common.clip_id,
             &common.spatial_id,
@@ -1072,16 +1093,36 @@
 
         let current_offset = self.current_offset(clip_and_scroll.spatial_node_index);
 
+        let snap_to_device = &mut self.sc_stack.last_mut().unwrap().snap_to_device;
+        snap_to_device.set_target_spatial_node(
+            clip_and_scroll.spatial_node_index,
+            self.clip_scroll_tree
+        );
+
         let clip_rect = common.clip_rect.translate(current_offset);
         let rect = bounds.translate(current_offset);
+
         let layout = LayoutPrimitiveInfo {
-            rect,
-            clip_rect,
+            rect: snap_to_device.snap_rect(&rect),
+            clip_rect: snap_to_device.snap_rect(&clip_rect),
             is_backface_visible: common.is_backface_visible,
             hit_info: common.hit_info,
         };
 
-        (layout, clip_and_scroll)
+        (layout, rect, clip_and_scroll)
+    }
+
+    pub fn snap_rect(
+        &mut self,
+        rect: &LayoutRect,
+        target_spatial_node: SpatialNodeIndex,
+    ) -> LayoutRect {
+        let snap_to_device = &mut self.sc_stack.last_mut().unwrap().snap_to_device;
+        snap_to_device.set_target_spatial_node(
+            target_spatial_node,
+            self.clip_scroll_tree
+        );
+        snap_to_device.snap_rect(rect)
     }
 
     fn flatten_item<'b>(
@@ -1092,7 +1133,7 @@
     ) -> Option<BuiltDisplayListIter<'a>> {
         match *item.item() {
             DisplayItem::Image(ref info) => {
-                let (layout, clip_and_scroll) = self.process_common_properties_with_bounds(
+                let (layout, _, clip_and_scroll) = self.process_common_properties_with_bounds(
                     &info.common,
                     &info.bounds,
                     apply_pipeline_clip,
@@ -1101,7 +1142,32 @@
                 self.add_image(
                     clip_and_scroll,
                     &layout,
+                    layout.rect.size,
+                    LayoutSize::zero(),
+                    None,
+                    info.image_key,
+                    info.image_rendering,
+                    info.alpha_type,
+                    info.color,
+                );
+            }
+            DisplayItem::RepeatingImage(ref info) => {
+                let (layout, unsnapped_rect, clip_and_scroll) = self.process_common_properties_with_bounds(
+                    &info.common,
+                    &info.bounds,
+                    apply_pipeline_clip,
+                );
+
+                let stretch_size = process_repeat_size(
+                    &layout.rect,
+                    &unsnapped_rect,
                     info.stretch_size,
+                );
+
+                self.add_image(
+                    clip_and_scroll,
+                    &layout,
+                    stretch_size,
                     info.tile_spacing,
                     None,
                     info.image_key,
@@ -1111,7 +1177,7 @@
                 );
             }
             DisplayItem::YuvImage(ref info) => {
-                let (layout, clip_and_scroll) = self.process_common_properties_with_bounds(
+                let (layout, _, clip_and_scroll) = self.process_common_properties_with_bounds(
                     &info.common,
                     &info.bounds,
                     apply_pipeline_clip,
@@ -1128,7 +1194,7 @@
                 );
             }
             DisplayItem::Text(ref info) => {
-                let (layout, clip_and_scroll) = self.process_common_properties_with_bounds(
+                let (layout, _, clip_and_scroll) = self.process_common_properties_with_bounds(
                     &info.common,
                     &info.bounds,
                     apply_pipeline_clip,
@@ -1179,7 +1245,7 @@
                 );
             }
             DisplayItem::Line(ref info) => {
-                let (layout, clip_and_scroll) = self.process_common_properties_with_bounds(
+                let (layout, _, clip_and_scroll) = self.process_common_properties_with_bounds(
                     &info.common,
                     &info.area,
                     apply_pipeline_clip,
@@ -1195,19 +1261,25 @@
                 );
             }
             DisplayItem::Gradient(ref info) => {
-                let (layout, clip_and_scroll) = self.process_common_properties_with_bounds(
+                let (layout, unsnapped_rect, clip_and_scroll) = self.process_common_properties_with_bounds(
                     &info.common,
                     &info.bounds,
                     apply_pipeline_clip,
                 );
 
+                let tile_size = process_repeat_size(
+                    &layout.rect,
+                    &unsnapped_rect,
+                    info.tile_size,
+                );
+
                 if let Some(prim_key_kind) = self.create_linear_gradient_prim(
                     &layout,
                     info.gradient.start_point,
                     info.gradient.end_point,
                     item.gradient_stops(),
                     info.gradient.extend_mode,
-                    info.tile_size,
+                    tile_size,
                     info.tile_spacing,
                     None,
                 ) {
@@ -1220,12 +1292,18 @@
                 }
             }
             DisplayItem::RadialGradient(ref info) => {
-                let (layout, clip_and_scroll) = self.process_common_properties_with_bounds(
+                let (layout, unsnapped_rect, clip_and_scroll) = self.process_common_properties_with_bounds(
                     &info.common,
                     &info.bounds,
                     apply_pipeline_clip,
                 );
 
+                let tile_size = process_repeat_size(
+                    &layout.rect,
+                    &unsnapped_rect,
+                    info.tile_size,
+                );
+
                 let prim_key_kind = self.create_radial_gradient_prim(
                     &layout,
                     info.gradient.center,
@@ -1234,7 +1312,7 @@
                     info.gradient.radius.width / info.gradient.radius.height,
                     item.gradient_stops(),
                     info.gradient.extend_mode,
-                    info.tile_size,
+                    tile_size,
                     info.tile_spacing,
                     None,
                 );
@@ -1247,7 +1325,7 @@
                 );
             }
             DisplayItem::BoxShadow(ref info) => {
-                let (layout, clip_and_scroll) = self.process_common_properties_with_bounds(
+                let (layout, _, clip_and_scroll) = self.process_common_properties_with_bounds(
                     &info.common,
                     &info.box_bounds,
                     apply_pipeline_clip,
@@ -1265,7 +1343,7 @@
                 );
             }
             DisplayItem::Border(ref info) => {
-                let (layout, clip_and_scroll) = self.process_common_properties_with_bounds(
+                let (layout, _, clip_and_scroll) = self.process_common_properties_with_bounds(
                     &info.common,
                     &info.bounds,
                     apply_pipeline_clip,
@@ -1682,6 +1760,7 @@
         clip_chain_id: ClipChainId,
         requested_raster_space: RasterSpace,
         is_backdrop_root: bool,
+        device_pixel_scale: DevicePixelScale,
     ) {
         // Check if this stacking context is the root of a pipeline, and the caller
         // has requested it as an output frame.
@@ -1784,6 +1863,14 @@
             current_clip_chain_id = clip_chain_node.parent_clip_chain_id;
         }
 
+        let snap_to_device = self.sc_stack.last().map_or(
+            SpaceSnapper::new(
+                ROOT_SPATIAL_NODE_INDEX,
+                device_pixel_scale,
+            ),
+            |sc| sc.snap_to_device.clone(),
+        );
+
         // Push the SC onto the stack, so we know how to handle things in
         // pop_stacking_context.
         self.sc_stack.push(FlattenedStackingContext {
@@ -1800,6 +1887,7 @@
             context_3d,
             create_tile_cache,
             is_backdrop_root,
+            snap_to_device,
         });
     }
 
@@ -2175,6 +2263,7 @@
         pipeline_id: PipelineId,
         viewport_size: &LayoutSize,
         content_size: &LayoutSize,
+        device_pixel_scale: DevicePixelScale,
     ) {
         if let ChasePrimitive::Id(id) = self.config.chase_primitive {
             println!("Chasing {:?} by index", id);
@@ -2193,13 +2282,27 @@
             LayoutVector2D::zero(),
         );
 
+        // We can't use this with the stacking context because it does not exist
+        // yet. Just create a dedicated snapper for the root.
+        let snap_to_device = SpaceSnapper::new_with_target(
+            spatial_node_index,
+            ROOT_SPATIAL_NODE_INDEX,
+            device_pixel_scale,
+            self.clip_scroll_tree,
+        );
+
+        let content_size = snap_to_device.snap_size(content_size);
+        let viewport_rect = snap_to_device.snap_rect(
+            &LayoutRect::new(LayoutPoint::zero(), *viewport_size),
+        );
+
         self.add_scroll_frame(
             SpatialId::root_scroll_node(pipeline_id),
             spatial_node_index,
             Some(ExternalScrollId(0, pipeline_id)),
             pipeline_id,
-            &LayoutRect::new(LayoutPoint::zero(), *viewport_size),
-            content_size,
+            &viewport_rect,
+            &content_size,
             ScrollSensitivity::ScriptAndInputEvents,
             ScrollFrameKind::PipelineRoot,
             LayoutVector2D::zero(),
@@ -2223,6 +2326,14 @@
         // Map the ClipId for the positioning node to a spatial node index.
         let spatial_node_index = self.id_to_index_mapper.get_spatial_node_index(space_and_clip.spatial_id);
 
+        let snap_to_device = &mut self.sc_stack.last_mut().unwrap().snap_to_device;
+        snap_to_device.set_target_spatial_node(
+            spatial_node_index,
+            self.clip_scroll_tree,
+        );
+
+        let snapped_clip_rect = snap_to_device.snap_rect(&clip_region.main);
+
         let mut clip_count = 0;
 
         // Intern each clip item in this clip node, and add the interned
@@ -2232,7 +2343,7 @@
 
         // Build the clip sources from the supplied region.
         let item = ClipItemKey {
-            kind: ClipItemKeyKind::rectangle(clip_region.main, ClipMode::Clip),
+            kind: ClipItemKeyKind::rectangle(snapped_clip_rect, ClipMode::Clip),
             spatial_node_index,
         };
         let handle = self
@@ -2249,8 +2360,9 @@
         clip_count += 1;
 
         if let Some(ref image_mask) = clip_region.image_mask {
+            let snapped_mask_rect = snap_to_device.snap_rect(&image_mask.rect);
             let item = ClipItemKey {
-                kind: ClipItemKeyKind::image_mask(image_mask),
+                kind: ClipItemKeyKind::image_mask(image_mask, snapped_mask_rect),
                 spatial_node_index,
             };
 
@@ -2269,9 +2381,10 @@
         }
 
         for region in clip_region.complex_clips {
+            let snapped_region_rect = snap_to_device.snap_rect(&region.rect);
             let item = ClipItemKey {
                 kind: ClipItemKeyKind::rounded_rect(
-                    region.rect,
+                    snapped_region_rect,
                     region.radii,
                     region.mode,
                 ),
@@ -2544,11 +2657,23 @@
         P: InternablePrimitive + CreateShadow,
         Interners: AsMut<Interner<P>>,
     {
-        // Offset the local rect and clip rect by the shadow offset.
+        let snap_to_device = &mut self.sc_stack.last_mut().unwrap().snap_to_device;
+        snap_to_device.set_target_spatial_node(
+            pending_primitive.clip_and_scroll.spatial_node_index,
+            self.clip_scroll_tree
+        );
+
+        // Offset the local rect and clip rect by the shadow offset. The pending
+        // primitive has already been snapped, but we will need to snap the
+        // shadow after translation. We don't need to worry about the size
+        // changing because the shadow has the same raster space as the
+        // primitive, and thus we know the size is already rounded.
         let mut info = pending_primitive.info.clone();
-        info.rect = info.rect.translate(pending_shadow.shadow.offset);
-        info.clip_rect = info.clip_rect.translate(
-            pending_shadow.shadow.offset
+        info.rect = snap_to_device.snap_rect(
+            &info.rect.translate(pending_shadow.shadow.offset),
+        );
+        info.clip_rect = snap_to_device.snap_rect(
+            &info.clip_rect.translate(pending_shadow.shadow.offset),
         );
 
         // Construct and add a primitive for the given shadow.
@@ -3437,6 +3562,13 @@
 
     /// True if this stacking context is a backdrop root.
     is_backdrop_root: bool,
+
+    /// A helper struct to snap local rects in device space. During frame
+    /// building we may establish new raster roots, however typically that is in
+    /// cases where we won't be applying snapping (e.g. has perspective), or in
+    /// edge cases (e.g. SVG filter) where we can accept slightly incorrect
+    /// behaviour in favour of getting the common case right.
+    snap_to_device: SpaceSnapper,
 }
 
 impl FlattenedStackingContext {
@@ -3690,3 +3822,22 @@
     //           more efficient than cloning these here.
     input_filter_primitives.iter().map(|primitive| primitive.into()).collect()
 }
+
+fn process_repeat_size(
+    snapped_rect: &LayoutRect,
+    unsnapped_rect: &LayoutRect,
+    repeat_size: LayoutSize,
+) -> LayoutSize {
+    LayoutSize::new(
+        if repeat_size.width == unsnapped_rect.size.width {
+            snapped_rect.size.width
+        } else {
+            repeat_size.width
+        },
+        if repeat_size.height == unsnapped_rect.size.height {
+            snapped_rect.size.height
+        } else {
+            repeat_size.height
+        },
+    )
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/frame_builder.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/frame_builder.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/frame_builder.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/frame_builder.rs	2019-09-15 11:33:11.000000000 +0000
@@ -392,7 +392,7 @@
             &frame_context,
             gpu_cache,
             &self.clip_store,
-            &data_stores.clip,
+            data_stores,
         );
 
         {
@@ -544,6 +544,7 @@
 
         clip_scroll_tree.update_tree(
             pan,
+            global_device_pixel_scale,
             scene_properties,
         );
         let mut transform_palette = clip_scroll_tree.build_transform_palette();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/gpu_types.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/gpu_types.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/gpu_types.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/gpu_types.rs	2019-09-15 11:33:10.000000000 +0000
@@ -169,7 +169,6 @@
     pub local_pos: LayoutPoint,
     pub tile_rect: LayoutRect,
     pub sub_rect: DeviceRect,
-    pub snap_offsets: SnapOffsets,
     pub task_origin: DevicePoint,
     pub screen_origin: DevicePoint,
     pub device_pixel_scale: f32,
@@ -250,7 +249,6 @@
         self.headers_float.push(PrimitiveHeaderF {
             local_rect: prim_header.local_rect,
             local_clip_rect: prim_header.local_clip_rect,
-            snap_offsets: prim_header.snap_offsets,
         });
 
         self.headers_int.push(PrimitiveHeaderI {
@@ -271,7 +269,6 @@
 pub struct PrimitiveHeader {
     pub local_rect: LayoutRect,
     pub local_clip_rect: LayoutRect,
-    pub snap_offsets: SnapOffsets,
     pub specific_prim_address: GpuCacheAddress,
     pub transform_id: TransformPaletteId,
 }
@@ -284,7 +281,6 @@
 pub struct PrimitiveHeaderF {
     pub local_rect: LayoutRect,
     pub local_clip_rect: LayoutRect,
-    pub snap_offsets: SnapOffsets,
 }
 
 // i32 parts of a primitive header
@@ -593,33 +589,6 @@
     },
 }
 
-/// Represents offsets in device pixels that a primitive
-/// was snapped to.
-#[cfg_attr(feature = "capture", derive(Serialize))]
-#[cfg_attr(feature = "replay", derive(Deserialize))]
-#[derive(Copy, Clone, Debug)]
-#[repr(C)]
-pub struct SnapOffsets {
-    /// How far the top left corner was snapped
-    pub top_left: DeviceVector2D,
-    /// How far the bottom right corner was snapped
-    pub bottom_right: DeviceVector2D,
-}
-
-impl SnapOffsets {
-    pub fn empty() -> Self {
-        SnapOffsets {
-            top_left: DeviceVector2D::zero(),
-            bottom_right: DeviceVector2D::zero(),
-        }
-    }
-
-    pub fn is_empty(&self) -> bool {
-        let zero = DeviceVector2D::zero();
-        self.top_left == zero && self.bottom_right == zero
-    }
-}
-
 #[derive(Debug, Copy, Clone)]
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/picture.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/picture.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/picture.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/picture.rs	2019-09-15 11:33:11.000000000 +0000
@@ -7,7 +7,7 @@
 use api::{DebugFlags, RasterSpace, ImageKey, ColorF};
 use api::units::*;
 use crate::box_shadow::{BLUR_SAMPLE_SCALE};
-use crate::clip::{ClipStore, ClipDataStore, ClipChainInstance, ClipDataHandle, ClipChainId};
+use crate::clip::{ClipStore, ClipChainInstance, ClipDataHandle, ClipChainId};
 use crate::clip_scroll_tree::{ROOT_SPATIAL_NODE_INDEX,
     ClipScrollTree, CoordinateSpaceMapping, SpatialNodeIndex, VisibleFace, CoordinateSystemId
 };
@@ -23,7 +23,7 @@
 use crate::gpu_types::UvRectKind;
 use plane_split::{Clipper, Polygon, Splitter};
 use crate::prim_store::{SpaceMapper, PrimitiveVisibilityMask, PointKey, PrimitiveTemplateKind};
-use crate::prim_store::{PictureIndex, PrimitiveInstance, PrimitiveInstanceKind};
+use crate::prim_store::{SpaceSnapper, PictureIndex, PrimitiveInstance, PrimitiveInstanceKind};
 use crate::prim_store::{get_raster_rects, PrimitiveScratchBuffer, RectangleKey};
 use crate::prim_store::{OpacityBindingStorage, ImageInstanceStorage, OpacityBindingIndex};
 use crate::print_tree::PrintTreePrinter;
@@ -1781,7 +1781,7 @@
         frame_context: &FrameBuildingContext,
         gpu_cache: &mut GpuCache,
         clip_store: &ClipStore,
-        clip_data_store: &ClipDataStore,
+        data_stores: &mut DataStores,
     ) {
         profile_marker!("UpdatePictures");
 
@@ -1798,7 +1798,7 @@
             frame_context,
             gpu_cache,
             clip_store,
-            clip_data_store,
+            data_stores,
         );
 
         if !state.are_raster_roots_assigned {
@@ -1861,7 +1861,7 @@
         frame_context: &FrameBuildingContext,
         gpu_cache: &mut GpuCache,
         clip_store: &ClipStore,
-        clip_data_store: &ClipDataStore,
+        data_stores: &mut DataStores,
     ) {
         if let Some(prim_list) = picture_primitives[pic_index.0].pre_update(
             self,
@@ -1874,7 +1874,7 @@
                     frame_context,
                     gpu_cache,
                     clip_store,
-                    clip_data_store,
+                    data_stores,
                 );
             }
 
@@ -1882,6 +1882,7 @@
                 prim_list,
                 self,
                 frame_context,
+                data_stores,
             );
         }
     }
@@ -2196,6 +2197,10 @@
 #[cfg_attr(feature = "capture", derive(Serialize))]
 pub struct ClusterIndex(pub u16);
 
+#[derive(Debug, Copy, Clone)]
+#[cfg_attr(feature = "capture", derive(Serialize))]
+pub struct PrimitiveIndex(pub u32);
+
 impl ClusterIndex {
     pub const INVALID: ClusterIndex = ClusterIndex(u16::MAX);
 }
@@ -2217,6 +2222,10 @@
     pub pictures: PictureList,
     /// List of primitives grouped into clusters.
     pub clusters: SmallVec<[PrimitiveCluster; 4]>,
+    /// List of primitive indicies that can only update
+    /// the cluster during frame building. This maps to
+    /// primitives in the prim_instances array.
+    pub deferred_prims: Vec<PrimitiveIndex>,
 }
 
 impl PrimitiveList {
@@ -2229,6 +2238,7 @@
             prim_instances: Vec::new(),
             pictures: SmallVec::new(),
             clusters: SmallVec::new(),
+            deferred_prims: Vec::new(),
         }
     }
 
@@ -2243,10 +2253,11 @@
         let mut pictures = SmallVec::new();
         let mut clusters_map = FastHashMap::default();
         let mut clusters: SmallVec<[PrimitiveCluster; 4]> = SmallVec::new();
+        let mut deferred_prims = Vec::new();
 
         // Walk the list of primitive instances and extract any that
         // are pictures.
-        for prim_instance in &mut prim_instances {
+        for (prim_index, prim_instance) in &mut prim_instances.iter_mut().enumerate() {
             // Check if this primitive is a picture. In future we should
             // remove this match and embed this info directly in the primitive instance.
             let is_pic = match prim_instance.kind {
@@ -2302,8 +2313,12 @@
                     (data.is_backface_visible, data.prim_size)
                 }
                 PrimitiveInstanceKind::Backdrop { data_handle, .. } => {
+                    // We don't know the actual size of the backdrop until frame
+                    // building, so use an empty rect for now and add it to the
+                    // deferred primitive list.
                     let data = &interners.backdrop[data_handle];
-                    (data.is_backface_visible, data.prim_size)
+                    deferred_prims.push(PrimitiveIndex(prim_index as u32));
+                    (data.is_backface_visible, LayoutSize::zero())
                 }
                 PrimitiveInstanceKind::PushClipChain |
                 PrimitiveInstanceKind::PopClipChain => {
@@ -2358,6 +2373,7 @@
             prim_instances,
             pictures,
             clusters,
+            deferred_prims,
         }
     }
 }
@@ -2424,16 +2440,9 @@
     pub spatial_node_index: SpatialNodeIndex,
 
     /// The local rect of this picture. It is built
-    /// dynamically when updating visibility. It takes
-    /// into account snapping in device space for its
-    /// children.
-    pub snapped_local_rect: LayoutRect,
-
-    /// The local rect of this picture. It is built
     /// dynamically during the first picture traversal. It
-    /// does not take into account snapping in device for
-    /// its children.
-    pub unsnapped_local_rect: LayoutRect,
+    /// is composed of already snapped primitives.
+    pub local_rect: LayoutRect,
 
     /// If false, this picture needs to (re)build segments
     /// if it supports segment rendering. This can occur
@@ -2458,8 +2467,7 @@
     ) {
         pt.new_level(format!("{:?}", self_index));
         pt.add_item(format!("prim_count: {:?}", self.prim_list.prim_instances.len()));
-        pt.add_item(format!("snapped_local_rect: {:?}", self.snapped_local_rect));
-        pt.add_item(format!("unsnapped_local_rect: {:?}", self.unsnapped_local_rect));
+        pt.add_item(format!("local_rect: {:?}", self.local_rect));
         pt.add_item(format!("spatial_node_index: {:?}", self.spatial_node_index));
         pt.add_item(format!("raster_config: {:?}", self.raster_config));
         pt.add_item(format!("requested_composite_mode: {:?}", self.requested_composite_mode));
@@ -2568,8 +2576,7 @@
             is_backface_visible,
             requested_raster_space,
             spatial_node_index,
-            snapped_local_rect: LayoutRect::zero(),
-            unsnapped_local_rect: LayoutRect::zero(),
+            local_rect: LayoutRect::zero(),
             tile_cache,
             options,
             segments_are_valid: false,
@@ -2673,7 +2680,7 @@
 
         match self.raster_config {
             Some(ref raster_config) => {
-                let pic_rect = PictureRect::from_untyped(&self.snapped_local_rect.to_untyped());
+                let pic_rect = PictureRect::from_untyped(&self.local_rect.to_untyped());
 
                 let device_pixel_scale = frame_state
                     .surfaces[raster_config.surface_index.0]
@@ -3444,6 +3451,7 @@
         prim_list: PrimitiveList,
         state: &mut PictureUpdateState,
         frame_context: &FrameBuildingContext,
+        data_stores: &mut DataStores,
     ) {
         // Restore the pictures list used during recursion.
         self.prim_list = prim_list;
@@ -3451,6 +3459,59 @@
         // Pop the state information about this picture.
         state.pop_picture();
 
+        // Update any primitives/cluster bounding rects that can only be done
+        // with information available during frame building.
+        for prim_index in &self.prim_list.deferred_prims {
+            let prim_instance = &mut self.prim_list.prim_instances[prim_index.0 as usize];
+            match prim_instance.kind {
+                PrimitiveInstanceKind::Backdrop { data_handle, .. } => {
+                    // The actual size and clip rect of this primitive are determined by computing the bounding
+                    // box of the projected rect of the backdrop-filter element onto the backdrop.
+                    let prim_data = &mut data_stores.backdrop[data_handle];
+                    let spatial_node_index = prim_data.kind.spatial_node_index;
+
+                    // We cannot use the relative transform between the backdrop and the element because
+                    // that doesn't take into account any projection transforms that both spatial nodes are children of.
+                    // Instead, we first project from the element to the world space and get a flattened 2D bounding rect
+                    // in the screen space, we then map this rect from the world space to the backdrop space to get the
+                    // proper bounding box where the backdrop-filter needs to be processed.
+
+                    let prim_to_world_mapper = SpaceMapper::new_with_target(
+                        ROOT_SPATIAL_NODE_INDEX,
+                        spatial_node_index,
+                        LayoutRect::max_rect(),
+                        frame_context.clip_scroll_tree,
+                    );
+
+                    let backdrop_to_world_mapper = SpaceMapper::new_with_target(
+                        ROOT_SPATIAL_NODE_INDEX,
+                        prim_instance.spatial_node_index,
+                        LayoutRect::max_rect(),
+                        frame_context.clip_scroll_tree,
+                    );
+
+                    // First map to the screen and get a flattened rect
+                    let prim_rect = prim_to_world_mapper.map(&prim_data.kind.border_rect).unwrap_or_else(LayoutRect::zero);
+                    // Backwards project the flattened rect onto the backdrop
+                    let prim_rect = backdrop_to_world_mapper.unmap(&prim_rect).unwrap_or_else(LayoutRect::zero);
+
+                    // TODO(aosmond): Is this safe? Updating the primitive size during
+                    // frame building is usually problematic since scene building will cache
+                    // the primitive information in the GPU already.
+                    prim_instance.prim_origin = prim_rect.origin;
+                    prim_data.common.prim_size = prim_rect.size;
+                    prim_instance.local_clip_rect = prim_rect;
+
+                    // Update the cluster bounding rect now that we have the backdrop rect.
+                    let cluster = &mut self.prim_list.clusters[prim_instance.cluster_index.0 as usize];
+                    cluster.bounding_rect = cluster.bounding_rect.union(&prim_rect);
+                }
+                _ => {
+                    panic!("BUG: unexpected deferred primitive kind for cluster updates");
+                }
+            }
+        }
+
         for cluster in &mut self.prim_list.clusters {
             // Skip the cluster if backface culled.
             if !cluster.is_backface_visible {
@@ -3502,6 +3563,18 @@
             // This inflaction factor is to be applied to the surface itself.
             if self.options.inflate_if_required {
                 surface.rect = raster_config.composite_mode.inflate_picture_rect(surface.rect, surface.inflation_factor);
+
+                // The picture's local rect is calculated as the union of the
+                // snapped primitive rects, which should result in a snapped
+                // local rect, unless it was inflated.
+                let snap_surface_to_raster = SpaceSnapper::new_with_target(
+                    surface.raster_spatial_node_index,
+                    self.spatial_node_index,
+                    surface.device_pixel_scale,
+                    frame_context.clip_scroll_tree,
+                );
+
+                surface.rect = snap_surface_to_raster.snap_rect(&surface.rect);
             }
 
             let mut surface_rect = surface.rect * Scale::new(1.0);
@@ -3510,11 +3583,6 @@
             let surface_index = state.pop_surface();
             debug_assert_eq!(surface_index, raster_config.surface_index);
 
-            // Snapping may change the local rect slightly, and as such should just be
-            // considered an estimated size for determining if we need raster roots and
-            // preparing the tile cache.
-            self.unsnapped_local_rect = surface_rect;
-
             // Check if any of the surfaces can't be rasterized in local space but want to.
             if raster_config.establishes_raster_root {
                 if surface_rect.size.width > MAX_SURFACE_SIZE ||
@@ -3525,6 +3593,8 @@
                 }
             }
 
+            self.local_rect = surface_rect;
+
             // Drop shadows draw both a content and shadow rect, so need to expand the local
             // rect of any surfaces to be composited in parent surfaces correctly.
             match raster_config.composite_mode {
@@ -3593,14 +3663,14 @@
                         // Basic brush primitive header is (see end of prepare_prim_for_render_inner in prim_store.rs)
                         //  [brush specific data]
                         //  [segment_rect, segment data]
-                        let shadow_rect = self.snapped_local_rect.translate(shadow.offset);
+                        let shadow_rect = self.local_rect.translate(shadow.offset);
 
                         // ImageBrush colors
                         request.push(shadow.color.premultiplied());
                         request.push(PremultipliedColorF::WHITE);
                         request.push([
-                            self.snapped_local_rect.size.width,
-                            self.snapped_local_rect.size.height,
+                            self.local_rect.size.width,
+                            self.local_rect.size.height,
                             0.0,
                             0.0,
                         ]);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/platform/unix/font.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/platform/unix/font.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/platform/unix/font.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/platform/unix/font.rs	2019-09-15 11:33:10.000000000 +0000
@@ -16,7 +16,7 @@
 use freetype::freetype::{FT_Err_Unimplemented_Feature};
 use freetype::freetype::{FT_LOAD_COLOR, FT_LOAD_DEFAULT, FT_LOAD_FORCE_AUTOHINT};
 use freetype::freetype::{FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH, FT_LOAD_NO_AUTOHINT};
-use freetype::freetype::{FT_LOAD_NO_BITMAP, FT_LOAD_NO_HINTING, FT_LOAD_VERTICAL_LAYOUT};
+use freetype::freetype::{FT_LOAD_NO_BITMAP, FT_LOAD_NO_HINTING};
 use freetype::freetype::{FT_FACE_FLAG_SCALABLE, FT_FACE_FLAG_FIXED_SIZES};
 use freetype::freetype::{FT_FACE_FLAG_MULTIPLE_MASTERS};
 use freetype::succeeded;
@@ -415,9 +415,6 @@
         if !font.flags.contains(FontInstanceFlags::EMBEDDED_BITMAPS) {
             load_flags |= FT_LOAD_NO_BITMAP;
         }
-        if font.flags.contains(FontInstanceFlags::VERTICAL_LAYOUT) {
-            load_flags |= FT_LOAD_VERTICAL_LAYOUT;
-        }
 
         load_flags |= FT_LOAD_COLOR;
         load_flags |= FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/prim_store/mod.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/prim_store/mod.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/prim_store/mod.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/prim_store/mod.rs	2019-09-15 11:33:10.000000000 +0000
@@ -22,7 +22,7 @@
 use crate::frame_builder::{FrameVisibilityContext, FrameVisibilityState};
 use crate::glyph_rasterizer::GlyphKey;
 use crate::gpu_cache::{GpuCache, GpuCacheAddress, GpuCacheHandle, GpuDataRequest, ToGpuBlocks};
-use crate::gpu_types::{BrushFlags, SnapOffsets};
+use crate::gpu_types::{BrushFlags};
 use crate::image::{Repetition};
 use crate::intern;
 use crate::internal_types::PlaneSplitAnchor;
@@ -52,7 +52,7 @@
 use std::sync::atomic::{AtomicUsize, Ordering};
 use crate::storage;
 use crate::texture_cache::TEXTURE_REGION_DIMENSIONS;
-use crate::util::{MatrixHelpers, MaxRect, Recycler};
+use crate::util::{MatrixHelpers, MaxRect, Recycler, ScaleOffset, RectHelpers};
 use crate::util::{clamp_to_scale_factor, pack_as_float, project_rect, raster_rect_to_device_pixels};
 use crate::internal_types::{LayoutPrimitiveInfo, Filter};
 use smallvec::SmallVec;
@@ -132,6 +132,91 @@
     }
 }
 
+#[derive(Clone, Debug)]
+pub struct SpaceSnapper {
+    pub ref_spatial_node_index: SpatialNodeIndex,
+    current_target_spatial_node_index: SpatialNodeIndex,
+    snapping_transform: Option<ScaleOffset>,
+    pub device_pixel_scale: DevicePixelScale,
+}
+
+impl SpaceSnapper {
+    pub fn new(
+        ref_spatial_node_index: SpatialNodeIndex,
+        device_pixel_scale: DevicePixelScale,
+    ) -> Self {
+        SpaceSnapper {
+            ref_spatial_node_index,
+            current_target_spatial_node_index: SpatialNodeIndex::INVALID,
+            snapping_transform: None,
+            device_pixel_scale,
+        }
+    }
+
+    pub fn new_with_target(
+        ref_spatial_node_index: SpatialNodeIndex,
+        target_node_index: SpatialNodeIndex,
+        device_pixel_scale: DevicePixelScale,
+        clip_scroll_tree: &ClipScrollTree,
+    ) -> Self {
+        let mut snapper = SpaceSnapper {
+            ref_spatial_node_index,
+            current_target_spatial_node_index: SpatialNodeIndex::INVALID,
+            snapping_transform: None,
+            device_pixel_scale,
+        };
+
+        snapper.set_target_spatial_node(target_node_index, clip_scroll_tree);
+        snapper
+    }
+
+    pub fn set_target_spatial_node(
+        &mut self,
+        target_node_index: SpatialNodeIndex,
+        clip_scroll_tree: &ClipScrollTree,
+    ) {
+        if target_node_index == self.current_target_spatial_node_index {
+            return
+        }
+
+        let ref_spatial_node = &clip_scroll_tree.spatial_nodes[self.ref_spatial_node_index.0 as usize];
+        let target_spatial_node = &clip_scroll_tree.spatial_nodes[target_node_index.0 as usize];
+
+        self.current_target_spatial_node_index = target_node_index;
+        self.snapping_transform = match (ref_spatial_node.snapping_transform, target_spatial_node.snapping_transform) {
+            (Some(ref ref_scale_offset), Some(ref target_scale_offset)) => {
+                Some(ref_scale_offset
+                    .inverse()
+                    .accumulate(target_scale_offset)
+                    .scale(self.device_pixel_scale.0))
+            }
+            _ => None,
+        };
+    }
+
+    pub fn snap_rect<F>(&self, rect: &Rect<f32, F>) -> Rect<f32, F> where F: fmt::Debug {
+        debug_assert!(self.current_target_spatial_node_index != SpatialNodeIndex::INVALID);
+        match self.snapping_transform {
+            Some(ref scale_offset) => {
+                let snapped_device_rect : DeviceRect = scale_offset.map_rect(rect).snap();
+                scale_offset.unmap_rect(&snapped_device_rect)
+            }
+            None => *rect,
+        }
+    }
+
+    pub fn snap_size<F>(&self, size: &Size2D<f32, F>) -> Size2D<f32, F> where F: fmt::Debug {
+        debug_assert!(self.current_target_spatial_node_index != SpatialNodeIndex::INVALID);
+        match self.snapping_transform {
+            Some(ref scale_offset) => {
+                let rect = Rect::<f32, F>::new(Point2D::<f32, F>::zero(), *size);
+                let snapped_device_rect : DeviceRect = scale_offset.map_rect(&rect).snap();
+                scale_offset.unmap_rect(&snapped_device_rect).size
+            }
+            None => *size,
+        }
+    }
+}
 
 #[derive(Debug, Clone)]
 pub struct SpaceMapper<F, T> {
@@ -933,7 +1018,6 @@
         frame_state: &mut FrameBuildingState,
         clip_data_store: &mut ClipDataStore,
         unclipped: &DeviceRect,
-        prim_snap_offsets: SnapOffsets,
         device_pixel_scale: DevicePixelScale,
     ) -> ClipMaskKind {
         match clip_chain {
@@ -956,9 +1040,8 @@
                 // Get a minimal device space rect, clipped to the screen that we
                 // need to allocate for the clip mask, as well as interpolated
                 // snap offsets.
-                let (device_rect, snap_offsets) = match get_clipped_device_rect(
+                let device_rect = match get_clipped_device_rect(
                     unclipped,
-                    prim_snap_offsets,
                     &pic_state.map_raster_to_world,
                     segment_world_rect,
                     device_pixel_scale,
@@ -978,7 +1061,6 @@
                     frame_state.resource_cache,
                     frame_state.render_tasks,
                     clip_data_store,
-                    snap_offsets,
                     device_pixel_scale,
                     frame_context.fb_config,
                 );
@@ -1436,18 +1518,6 @@
     /// The current combined local clip for this primitive, from
     /// the primitive local clip above and the current clip chain.
     pub combined_local_clip_rect: LayoutRect,
-
-    /// The snap offsets in device space for this primitive. They are
-    /// generated based on the visible rect, which is the local rect
-    /// clipped by the combined local clip for most primitives, or
-    /// just the local rect for pictures.
-    pub snap_offsets: SnapOffsets,
-
-    /// The snap offsets in device space for the drop shadow for
-    /// picture primitives, if applicable. Similar to snap offsets,
-    /// they are generated based on the local rect translated by the
-    /// drop shadow offset.
-    pub shadow_snap_offsets: SnapOffsets,
 }
 
 #[derive(Clone, Debug)]
@@ -1808,7 +1878,7 @@
         world_culling_rect: &WorldRect,
         frame_context: &FrameVisibilityContext,
         frame_state: &mut FrameVisibilityState,
-    ) -> Option<PictureRect> {
+    ) {
         let (mut prim_list, surface_index, apply_local_clip_rect, world_culling_rect, is_composite) = {
             let pic = &mut self.pictures[pic_index.0];
             let mut world_culling_rect = *world_culling_rect;
@@ -1828,7 +1898,7 @@
                     // relative transforms have changed, which means we need to
                     // re-map the dependencies of any child primitives.
                     world_culling_rect = tile_cache.pre_update(
-                        PictureRect::from_untyped(&pic.unsnapped_local_rect.to_untyped()),
+                        PictureRect::from_untyped(&pic.local_rect.to_untyped()),
                         surface_index,
                         frame_context,
                         frame_state,
@@ -1862,19 +1932,13 @@
             frame_context.clip_scroll_tree,
         );
 
-        let mut map_local_to_raster = SpaceMapper::new(
-            surface.raster_spatial_node_index,
-            RasterRect::max_rect(),
-        );
-
-        let mut surface_rect = PictureRect::zero();
-
         for prim_instance in &mut prim_list.prim_instances {
             prim_instance.reset();
 
             if prim_instance.is_chased() {
                 #[cfg(debug_assertions)] // needed for ".id" part
                 println!("\tpreparing {:?} in {:?}", prim_instance.id, pic_index);
+                println!("\t{:?}", prim_instance.kind);
             }
 
             // Get the cluster and see if is visible
@@ -1890,12 +1954,7 @@
                 frame_context.clip_scroll_tree,
             );
 
-            map_local_to_raster.set_target_spatial_node(
-                prim_instance.spatial_node_index,
-                frame_context.clip_scroll_tree,
-            );
-
-            let (is_passthrough, snap_to_visible, prim_local_rect, prim_shadow_rect) = match prim_instance.kind {
+            let (is_passthrough, prim_local_rect, prim_shadow_rect) = match prim_instance.kind {
                 PrimitiveInstanceKind::PushClipChain => {
                     frame_state.clip_chain_stack.push_clip(
                         prim_instance.clip_chain_id,
@@ -1917,7 +1976,7 @@
                         frame_state.clip_store,
                     );
 
-                    let pic_surface_rect = self.update_visibility(
+                    self.update_visibility(
                         pic_index,
                         surface_index,
                         &world_culling_rect,
@@ -1927,8 +1986,6 @@
 
                     frame_state.clip_chain_stack.pop_clip();
 
-                    let pic = &self.pictures[pic_index.0];
-
                     // The local rect of pictures is calculated dynamically based on
                     // the content of children, which may move due to the spatial
                     // node they are attached to. Other parts of the code (such as
@@ -1938,74 +1995,22 @@
                     //           this way. In future, we could perhaps just store the
                     //           size in the picture primitive, to that there isn't
                     //           any duplicated data.
-                    prim_instance.prim_origin = pic.snapped_local_rect.origin;
-
-                    let shadow_rect = match pic.raster_config {
-                        Some(ref rc) => match rc.composite_mode {
-                            // If we have a drop shadow filter, we also need to include the shadow in
-                            // our local rect for the purpose of calculating the size of the picture.
-                            PictureCompositeMode::Filter(Filter::DropShadows(ref shadows)) => {
-                                let mut rect = LayoutRect::zero();
-                                for shadow in shadows {
-                                    rect = rect.union(&pic.snapped_local_rect.translate(shadow.offset));
-                                }
+                    let pic = &self.pictures[pic_index.0];
+                    prim_instance.prim_origin = pic.local_rect.origin;
 
-                                rect
-                            }
-                            _ => LayoutRect::zero(),
-                        }
-                        None => {
-                            if let Some(ref rect) = pic_surface_rect {
-                                surface_rect = surface_rect.union(rect);
-                            }
-                            LayoutRect::zero()
+                    let shadow_rect = if let Some(RasterConfig { composite_mode: PictureCompositeMode::Filter(Filter::DropShadows(ref shadows)), .. }) = pic.raster_config {
+                        // If we have a drop shadow filter, we also need to include the shadow in
+                        // our local rect for the purpose of calculating the size of the picture.
+                        let mut rect = LayoutRect::zero();
+                        for shadow in shadows {
+                            rect = rect.union(&pic.local_rect.translate(shadow.offset));
                         }
+                        rect
+                    } else {
+                        LayoutRect::zero()
                     };
 
-                    if prim_instance.is_chased() {
-                        if pic.unsnapped_local_rect != pic.snapped_local_rect {
-                            println!("\tsnapped from {:?} to {:?}", pic.unsnapped_local_rect, pic.snapped_local_rect);
-                        }
-                    }
-
-                    (pic.raster_config.is_none(), false, pic.snapped_local_rect, shadow_rect)
-                }
-                PrimitiveInstanceKind::Backdrop { data_handle } => {
-                    // The actual size and clip rect of this primitive are determined by computing the bounding
-                    // box of the projected rect of the backdrop-filter element onto the backdrop.
-                    let prim_data = &mut frame_state.data_stores.backdrop[data_handle];
-                    let spatial_node_index = prim_data.kind.spatial_node_index;
-
-                    // We cannot use the relative transform between the backdrop and the element because
-                    // that doesn't take into account any projection transforms that both spatial nodes are children of.
-                    // Instead, we first project from the element to the world space and get a flattened 2D bounding rect
-                    // in the screen space, we then map this rect from the world space to the backdrop space to get the
-                    // proper bounding box where the backdrop-filter needs to be processed.
-
-                    let prim_to_world_mapper = SpaceMapper::new_with_target(
-                        ROOT_SPATIAL_NODE_INDEX,
-                        spatial_node_index,
-                        LayoutRect::max_rect(),
-                        frame_context.clip_scroll_tree,
-                    );
-
-                    let backdrop_to_world_mapper = SpaceMapper::new_with_target(
-                        ROOT_SPATIAL_NODE_INDEX,
-                        prim_instance.spatial_node_index,
-                        LayoutRect::max_rect(),
-                        frame_context.clip_scroll_tree,
-                    );
-
-                    // First map to the screen and get a flattened rect
-                    let prim_rect = prim_to_world_mapper.map(&prim_data.kind.border_rect).unwrap_or_else(LayoutRect::zero);
-                    // Backwards project the flattened rect onto the backdrop
-                    let prim_rect = backdrop_to_world_mapper.unmap(&prim_rect).unwrap_or_else(LayoutRect::zero);
-
-                    prim_instance.prim_origin = prim_rect.origin;
-                    prim_data.common.prim_size = prim_rect.size;
-                    prim_instance.local_clip_rect = prim_rect;
-
-                    (false, true, prim_rect, LayoutRect::zero())
+                    (pic.raster_config.is_none(), pic.local_rect, shadow_rect)
                 }
                 _ => {
                     let prim_data = &frame_state.data_stores.as_common_data(&prim_instance);
@@ -2015,7 +2020,7 @@
                         prim_data.prim_size,
                     );
 
-                    (false, true, prim_rect, LayoutRect::zero())
+                    (false, prim_rect, LayoutRect::zero())
                 }
             };
 
@@ -2028,8 +2033,6 @@
                         clip_chain: ClipChainInstance::empty(),
                         clip_task_index: ClipTaskIndex::INVALID,
                         combined_local_clip_rect: LayoutRect::zero(),
-                        snap_offsets: SnapOffsets::empty(),
-                        shadow_snap_offsets: SnapOffsets::empty(),
                         visibility_mask: PrimitiveVisibilityMask::empty(),
                     }
                 );
@@ -2172,56 +2175,6 @@
                     continue;
                 }
 
-                // All pictures must snap to their primitive rect instead of the
-                // visible rect like most primitives. This is because the picture's
-                // visible rect includes the effect of the picture's clip rect,
-                // which was not considered by the picture's children. The primitive
-                // rect however is simply the union of the visible rect of the
-                // children, which they snapped to, which is precisely what we also
-                // need to snap to in order to be consistent.
-                let visible_rect = if snap_to_visible {
-                    match combined_local_clip_rect.intersection(&prim_local_rect) {
-                        Some(r) => r,
-                        None => {
-                            if prim_instance.is_chased() {
-                                println!("\tculled for zero visible rectangle");
-                            }
-                            prim_instance.visibility_info = PrimitiveVisibilityIndex::INVALID;
-                            continue;
-                        }
-                    }
-                } else {
-                    prim_local_rect
-                };
-
-                // This is how primitives get snapped. In general, snapping a picture's
-                // visible rect here will have no effect, but if it is rasterized in its
-                // own space, or it has a blur or drop shadow effect applied, it may
-                // provide a snapping offset.
-                let (snapped_visible_rect, snap_offsets) = get_snapped_rect(
-                    visible_rect,
-                    &map_local_to_raster,
-                    surface.device_pixel_scale,
-                ).unwrap_or((visible_rect, SnapOffsets::empty()));
-
-                let (combined_visible_rect, shadow_snap_offsets) = if !prim_shadow_rect.is_empty() {
-                    let (snapped_shadow_rect, shadow_snap_offsets) = get_snapped_rect(
-                        prim_shadow_rect,
-                        &map_local_to_raster,
-                        surface.device_pixel_scale,
-                    ).unwrap_or((prim_shadow_rect, SnapOffsets::empty()));
-
-                    (snapped_visible_rect.union(&snapped_shadow_rect), shadow_snap_offsets)
-                } else {
-                    (snapped_visible_rect, SnapOffsets::empty())
-                };
-
-                // Include the snapped primitive/picture local rect, including any shadows,
-                // in the area affected by the surface.
-                if let Some(rect) = map_local_to_surface.map(&combined_visible_rect) {
-                    surface_rect = surface_rect.union(&rect);
-                }
-
                 // When the debug display is enabled, paint a colored rectangle around each
                 // primitive.
                 if frame_context.debug_flags.contains(::api::DebugFlags::PRIMITIVE_DBG) {
@@ -2258,8 +2211,6 @@
                         clip_chain,
                         clip_task_index: ClipTaskIndex::INVALID,
                         combined_local_clip_rect,
-                        snap_offsets,
-                        shadow_snap_offsets,
                         visibility_mask: PrimitiveVisibilityMask::empty(),
                     }
                 );
@@ -2290,55 +2241,18 @@
         // TODO(gw): In future, if we support specifying a flag which gets the
         //           stretch size from the segment rect in the shaders, we can
         //           remove this invalidation here completely.
-        if let Some(ref raster_config) = pic.raster_config {
-            // Inflate the local bounding rect if required by the filter effect.
-            // This inflaction factor is to be applied to the surface itself.
-            if pic.options.inflate_if_required {
-                surface_rect = raster_config.composite_mode.inflate_picture_rect(surface_rect, surface.inflation_factor);
-            }
+        if let Some(RasterConfig { composite_mode: PictureCompositeMode::TileCache { .. }, .. }) = pic.raster_config {
+            let mut tile_cache = frame_state.tile_cache.take().unwrap();
 
-            // Layout space for the picture is picture space from the
-            // perspective of its child primitives.
-            let pic_local_rect = surface_rect * Scale::new(1.0);
-            if pic.snapped_local_rect != pic_local_rect {
-                match raster_config.composite_mode {
-                    PictureCompositeMode::Filter(Filter::DropShadows(..)) => {
-                        for handle in &pic.extra_gpu_data_handles {
-                            frame_state.gpu_cache.invalidate(handle);
-                        }
-                    }
-                    _ => {}
-                }
-                // Invalidate any segments built for this picture, since the local
-                // rect has changed.
-                pic.segments_are_valid = false;
-                pic.snapped_local_rect = pic_local_rect;
-            }
-
-            if let PictureCompositeMode::TileCache { .. } = raster_config.composite_mode {
-                let mut tile_cache = frame_state.tile_cache.take().unwrap();
-
-                // Build the dirty region(s) for this tile cache.
-                tile_cache.post_update(
-                    frame_state.resource_cache,
-                    frame_state.gpu_cache,
-                    frame_context,
-                    frame_state.scratch,
-                );
-
-                pic.tile_cache = Some(tile_cache);
-            }
-
-            None
-        } else {
-            let parent_surface = &frame_context.surfaces[parent_surface_index.0 as usize];
-            let map_surface_to_parent_surface = SpaceMapper::new_with_target(
-                parent_surface.surface_spatial_node_index,
-                surface.surface_spatial_node_index,
-                PictureRect::max_rect(),
-                frame_context.clip_scroll_tree,
+            // Build the dirty region(s) for this tile cache.
+            tile_cache.post_update(
+                frame_state.resource_cache,
+                frame_state.gpu_cache,
+                frame_context,
+                frame_state.scratch,
             );
-            map_surface_to_parent_surface.map(&surface_rect)
+
+            pic.tile_cache = Some(tile_cache);
         }
     }
 
@@ -3316,7 +3230,7 @@
                             splitter,
                             frame_context.clip_scroll_tree,
                             prim_instance.spatial_node_index,
-                            pic.snapped_local_rect,
+                            pic.local_rect,
                             &prim_info.combined_local_clip_rect,
                             frame_state.current_dirty_region().combined,
                             plane_split_anchor,
@@ -3626,13 +3540,15 @@
 impl PrimitiveInstance {
     fn build_segments_if_needed(
         &mut self,
-        prim_clip_chain: &ClipChainInstance,
+        prim_info: &PrimitiveVisibility,
         frame_state: &mut FrameBuildingState,
         prim_store: &mut PrimitiveStore,
         data_stores: &DataStores,
         segments_store: &mut SegmentStorage,
         segment_instances_store: &mut SegmentInstanceStorage,
     ) {
+        let prim_clip_chain = &prim_info.clip_chain;
+
         // Usually, the primitive rect can be found from information
         // in the instance and primitive template.
         let mut prim_local_rect = LayoutRect::new(
@@ -3676,7 +3592,7 @@
 
                     // Override the prim local rect with the dynamically calculated
                     // local rect for the picture.
-                    prim_local_rect = pic.snapped_local_rect;
+                    prim_local_rect = pic.local_rect;
 
                     segment_instance_index
                 } else {
@@ -3863,7 +3779,6 @@
                 frame_state,
                 &mut data_stores.clip,
                 unclipped,
-                prim_info.snap_offsets,
                 device_pixel_scale,
             );
             clip_mask_instances.push(clip_mask_kind);
@@ -3884,10 +3799,7 @@
                 let segment_clip_chain = frame_state
                     .clip_store
                     .build_clip_chain_instance(
-                        segment.local_rect.translate(LayoutVector2D::new(
-                            self.prim_origin.x,
-                            self.prim_origin.y,
-                        )),
+                        segment.local_rect.translate(self.prim_origin.to_vector()),
                         &pic_state.map_local_to_pic,
                         &pic_state.map_pic_to_world,
                         &frame_context.clip_scroll_tree,
@@ -3910,7 +3822,6 @@
                     frame_state,
                     &mut data_stores.clip,
                     unclipped,
-                    prim_info.snap_offsets,
                     device_pixel_scale,
                 );
                 clip_mask_instances.push(clip_mask_kind);
@@ -3949,7 +3860,7 @@
         };
 
         self.build_segments_if_needed(
-            &prim_info.clip_chain,
+            &prim_info,
             frame_state,
             prim_store,
             data_stores,
@@ -3983,9 +3894,8 @@
             // Get a minimal device space rect, clipped to the screen that we
             // need to allocate for the clip mask, as well as interpolated
             // snap offsets.
-            if let Some((device_rect, snap_offsets)) = get_clipped_device_rect(
+            if let Some(device_rect) = get_clipped_device_rect(
                 &unclipped,
-                prim_info.snap_offsets,
                 &pic_state.map_raster_to_world,
                 prim_info.clipped_world_rect,
                 device_pixel_scale,
@@ -3999,7 +3909,6 @@
                     frame_state.resource_cache,
                     frame_state.render_tasks,
                     &mut data_stores.clip,
-                    snap_offsets,
                     device_pixel_scale,
                     frame_context.fb_config,
                 );
@@ -4022,80 +3931,6 @@
     }
 }
 
-/// Mimics the GLSL mix() function.
-fn mix(x: f32, y: f32, a: f32) -> f32 {
-    x * (1.0 - a) + y * a
-}
-
-/// Given a point within a local rectangle, and the device space corners
-/// of a snapped primitive, return the snap offsets.
-fn compute_snap_offset_impl<PixelSpace>(
-    reference_pos: Point2D<f32, PixelSpace>,
-    reference_rect: Rect<f32, PixelSpace>,
-    prim_top_left: DevicePoint,
-    prim_bottom_right: DevicePoint,
-) -> DeviceVector2D {
-    let normalized_snap_pos = Point2D::<f32, PixelSpace>::new(
-        (reference_pos.x - reference_rect.origin.x) / reference_rect.size.width,
-        (reference_pos.y - reference_rect.origin.y) / reference_rect.size.height,
-    );
-
-    let top_left = DeviceVector2D::new(
-        (prim_top_left.x + 0.5).floor() - prim_top_left.x,
-        (prim_top_left.y + 0.5).floor() - prim_top_left.y,
-    );
-
-    let bottom_right = DeviceVector2D::new(
-        (prim_bottom_right.x + 0.5).floor() - prim_bottom_right.x,
-        (prim_bottom_right.y + 0.5).floor() - prim_bottom_right.y,
-    );
-
-    DeviceVector2D::new(
-        mix(top_left.x, bottom_right.x, normalized_snap_pos.x),
-        mix(top_left.y, bottom_right.y, normalized_snap_pos.y),
-    )
-}
-
-/// Given the snapping offsets for a primitive rectangle, recompute
-/// the snapping offsets to be relative to given local rectangle.
-/// This *must* exactly match the logic in the GLSL
-/// compute_snap_offset function.
-pub fn recompute_snap_offsets<PixelSpace>(
-    local_rect: Rect<f32, PixelSpace>,
-    prim_rect: Rect<f32, PixelSpace>,
-    snap_offsets: SnapOffsets,
-) -> SnapOffsets
-{
-    if prim_rect.is_empty() || snap_offsets.is_empty() {
-        return SnapOffsets::empty();
-    }
-
-    let normalized_top_left = Point2D::<f32, PixelSpace>::new(
-        (local_rect.origin.x - prim_rect.origin.x) / prim_rect.size.width,
-        (local_rect.origin.y - prim_rect.origin.y) / prim_rect.size.height,
-    );
-
-    let normalized_bottom_right = Point2D::<f32, PixelSpace>::new(
-        (local_rect.origin.x + local_rect.size.width - prim_rect.origin.x) / prim_rect.size.width,
-        (local_rect.origin.y + local_rect.size.height - prim_rect.origin.y) / prim_rect.size.height,
-    );
-
-    let top_left = DeviceVector2D::new(
-        mix(snap_offsets.top_left.x, snap_offsets.bottom_right.x, normalized_top_left.x),
-        mix(snap_offsets.top_left.y, snap_offsets.bottom_right.y, normalized_top_left.y),
-    );
-
-    let bottom_right = DeviceVector2D::new(
-        mix(snap_offsets.top_left.x, snap_offsets.bottom_right.x, normalized_bottom_right.x),
-        mix(snap_offsets.top_left.y, snap_offsets.bottom_right.y, normalized_bottom_right.y),
-    );
-
-    SnapOffsets {
-        top_left,
-        bottom_right,
-    }
-}
-
 /// Retrieve the exact unsnapped device space rectangle for a primitive.
 fn get_unclipped_device_rect(
     prim_rect: PictureRect,
@@ -4114,11 +3949,10 @@
 /// scale per-raster-root.
 fn get_clipped_device_rect(
     unclipped: &DeviceRect,
-    prim_snap_offsets: SnapOffsets,
     map_to_world: &SpaceMapper<RasterPixel, WorldPixel>,
     prim_bounding_rect: WorldRect,
     device_pixel_scale: DevicePixelScale,
-) -> Option<(DeviceIntRect, SnapOffsets)> {
+) -> Option<DeviceIntRect> {
     let unclipped_raster_rect = {
         let world_rect = *unclipped * Scale::new(1.0);
         let raster_rect = world_rect * device_pixel_scale.inv();
@@ -4143,28 +3977,7 @@
         device_pixel_scale,
     );
 
-    let fx0 = (clipped.origin.x - unclipped.origin.x) / unclipped.size.width;
-    let fy0 = (clipped.origin.y - unclipped.origin.y) / unclipped.size.height;
-
-    let fx1 = (clipped.origin.x + clipped.size.width - unclipped.origin.x) / unclipped.size.width;
-    let fy1 = (clipped.origin.y + clipped.size.height - unclipped.origin.y) / unclipped.size.height;
-
-    let top_left = DeviceVector2D::new(
-        mix(prim_snap_offsets.top_left.x, prim_snap_offsets.bottom_right.x, fx0),
-        mix(prim_snap_offsets.top_left.y, prim_snap_offsets.bottom_right.y, fy0),
-    );
-
-    let bottom_right = DeviceVector2D::new(
-        mix(prim_snap_offsets.top_left.x, prim_snap_offsets.bottom_right.x, fx1),
-        mix(prim_snap_offsets.top_left.y, prim_snap_offsets.bottom_right.y, fy1),
-    );
-
-    let snap_offsets = SnapOffsets {
-        top_left,
-        bottom_right,
-    };
-
-    Some((clipped.to_i32(), snap_offsets))
+    Some(clipped.to_i32())
 }
 
 pub fn get_raster_rects(
@@ -4202,61 +4015,6 @@
     Some((clipped.to_i32(), unclipped))
 }
 
-/// Snap the given rect in raster space if the transform is
-/// axis-aligned. It return the snapped rect transformed back into the
-/// given pixel space, and the snap offsets in device space.
-pub fn get_snapped_rect<PixelSpace>(
-    prim_rect: Rect<f32, PixelSpace>,
-    map_to_raster: &SpaceMapper<PixelSpace, RasterPixel>,
-    device_pixel_scale: DevicePixelScale,
-) -> Option<(Rect<f32, PixelSpace>, SnapOffsets)> where PixelSpace: fmt::Debug {
-    let is_axis_aligned = match map_to_raster.kind {
-        CoordinateSpaceMapping::Local |
-        CoordinateSpaceMapping::ScaleOffset(..) => true,
-        CoordinateSpaceMapping::Transform(ref transform) => transform.preserves_2d_axis_alignment(),
-    };
-
-    if is_axis_aligned {
-       let raster_rect = map_to_raster.map(&prim_rect)?;
-
-       let device_rect = {
-            let world_rect = raster_rect * Scale::new(1.0);
-            world_rect * device_pixel_scale
-        };
-
-        let top_left = compute_snap_offset_impl(
-            prim_rect.origin,
-            prim_rect,
-            device_rect.origin,
-            device_rect.bottom_right(),
-        );
-
-        let bottom_right = compute_snap_offset_impl(
-            prim_rect.bottom_right(),
-            prim_rect,
-            device_rect.origin,
-            device_rect.bottom_right(),
-        );
-
-        let snap_offsets = SnapOffsets {
-            top_left,
-            bottom_right,
-        };
-
-        let snapped_device_rect = DeviceRect::new(
-            device_rect.origin + top_left,
-            device_rect.size + (bottom_right - top_left).to_size()
-        );
-
-        let snapped_world_rect = snapped_device_rect / device_pixel_scale;
-        let snapped_raster_rect = snapped_world_rect * Scale::new(1.0);
-        let snapped_prim_rect = map_to_raster.unmap(&snapped_raster_rect)?;
-        Some((snapped_prim_rect, snap_offsets))
-    } else {
-        None
-    }
-}
-
 /// Get the inline (horizontal) and block (vertical) sizes
 /// for a given line decoration.
 pub fn get_line_decoration_sizes(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/profiler.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/profiler.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/profiler.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/profiler.rs	2019-09-15 11:33:11.000000000 +0000
@@ -18,7 +18,7 @@
 const GRAPH_HEIGHT: f32 = 320.0;
 const GRAPH_PADDING: f32 = 8.0;
 const GRAPH_FRAME_HEIGHT: f32 = 16.0;
-const PROFILE_PADDING: f32 = 10.0;
+const PROFILE_PADDING: f32 = 8.0;
 
 const ONE_SECOND_NS: u64 = 1000000000;
 
@@ -436,6 +436,7 @@
     pub pages_color8_linear: ResourceProfileCounter,
     pub pages_color8_nearest: ResourceProfileCounter,
     pub pages_picture: ResourceProfileCounter,
+    pub rasterized_blob_pixels: ResourceProfileCounter,
 }
 
 impl TextureCacheProfileCounters {
@@ -446,6 +447,7 @@
             pages_color8_linear: ResourceProfileCounter::new("Texture RGBA8 cached pages (L)"),
             pages_color8_nearest: ResourceProfileCounter::new("Texture RGBA8 cached pages (N)"),
             pages_picture: ResourceProfileCounter::new("Picture cached pages"),
+            rasterized_blob_pixels: ResourceProfileCounter::new("Rasterized Blob Pixels"),
         }
     }
 }
@@ -592,6 +594,7 @@
         self.ipc.consume_time.reset();
         self.ipc.send_time.reset();
         self.ipc.display_lists.reset();
+        self.resources.texture_cache.rasterized_blob_pixels.reset();
     }
 }
 
@@ -653,28 +656,34 @@
 
 struct ProfileGraph {
     max_samples: usize,
+    scale: f32,
     values: VecDeque<f32>,
     short_description: &'static str,
+    unit_description: &'static str,
 }
 
 impl ProfileGraph {
     fn new(
         max_samples: usize,
+        scale: f32,
         short_description: &'static str,
+        unit_description: &'static str,
     ) -> Self {
         ProfileGraph {
             max_samples,
+            scale,
             values: VecDeque::new(),
             short_description,
+            unit_description,
         }
     }
 
     fn push(&mut self, ns: u64) {
-        let ms = ns as f64 / 1000000.0;
+        let val = ns as f64 * self.scale as f64;
         if self.values.len() == self.max_samples {
             self.values.pop_back();
         }
-        self.values.push_front(ms as f32);
+        self.values.push_front(val as f32);
     }
 
     fn stats(&self) -> GraphStats {
@@ -704,7 +713,7 @@
         description: &'static str,
         debug_renderer: &mut DebugRenderer,
     ) -> default::Rect<f32> {
-        let size = Size2D::new(600.0, 120.0);
+        let size = Size2D::new(600.0, 100.0);
         let line_height = debug_renderer.line_height();
         let graph_rect = Rect::new(Point2D::new(x, y), size);
         let mut rect = graph_rect.inflate(10.0, 10.0);
@@ -723,21 +732,21 @@
         debug_renderer.add_text(
             text_origin.x,
             text_origin.y + line_height,
-            &format!("Min: {:.2} ms", stats.min_value),
+            &format!("Min: {:.2} {}", stats.min_value, self.unit_description),
             text_color,
             None,
         );
         debug_renderer.add_text(
             text_origin.x,
             text_origin.y + line_height * 2.0,
-            &format!("Mean: {:.2} ms", stats.mean_value),
+            &format!("Mean: {:.2} {}", stats.mean_value, self.unit_description),
             text_color,
             None,
         );
         debug_renderer.add_text(
             text_origin.x,
             text_origin.y + line_height * 3.0,
-            &format!("Max: {:.2} ms", stats.max_value),
+            &format!("Max: {:.2} {}", stats.max_value, self.unit_description),
             text_color,
             None,
         );
@@ -931,6 +940,7 @@
     renderer_graph: ProfileGraph,
     gpu_graph: ProfileGraph,
     ipc_graph: ProfileGraph,
+    blob_raster_graph: ProfileGraph,
     backend_time: AverageTimeProfileCounter,
     renderer_time: AverageTimeProfileCounter,
     gpu_time: AverageTimeProfileCounter,
@@ -940,6 +950,7 @@
 
 impl Profiler {
     pub fn new() -> Self {
+        let to_ms_scale = 1.0 / 1000000.0;
         Profiler {
             draw_state: DrawState {
                 x_left: 0.0,
@@ -947,10 +958,11 @@
                 x_right: 0.0,
                 y_right: 0.0,
             },
-            backend_graph: ProfileGraph::new(600, "Backend:"),
-            renderer_graph: ProfileGraph::new(600, "Renderer:"),
-            gpu_graph: ProfileGraph::new(600, "GPU:"),
-            ipc_graph: ProfileGraph::new(600, "IPC:"),
+            backend_graph: ProfileGraph::new(600, to_ms_scale, "Backend:", "ms"),
+            renderer_graph: ProfileGraph::new(600, to_ms_scale, "Renderer:", "ms"),
+            gpu_graph: ProfileGraph::new(600, to_ms_scale, "GPU:", "ms"),
+            ipc_graph: ProfileGraph::new(600, to_ms_scale, "IPC:", "ms"),
+            blob_raster_graph: ProfileGraph::new(600, 1.0, "Rasterized blob pixels:", "px"),
             gpu_frames: GpuFrameCollection::new(),
             backend_time: AverageTimeProfileCounter::new("Backend:", false, ONE_SECOND_NS / 2),
             renderer_time: AverageTimeProfileCounter::new("Renderer:", false, ONE_SECOND_NS / 2),
@@ -1323,6 +1335,11 @@
         let rect = self.gpu_graph
             .draw_graph(self.draw_state.x_right, self.draw_state.y_right, "GPU", debug_renderer);
         self.draw_state.y_right += rect.size.height + PROFILE_PADDING;
+
+        let rect = self.blob_raster_graph
+            .draw_graph(self.draw_state.x_right, self.draw_state.y_right, "Blob pixels", debug_renderer);
+        self.draw_state.y_right += rect.size.height + PROFILE_PADDING;
+
         let rect = self.gpu_frames
             .draw(self.draw_state.x_left, f32::max(self.draw_state.y_left, self.draw_state.y_right), debug_renderer);
         self.draw_state.y_right += rect.size.height + PROFILE_PADDING;
@@ -1359,6 +1376,8 @@
         self.renderer_time.set(renderer_timers.cpu_time.nanoseconds);
         self.ipc_graph
             .push(backend_profile.ipc.total_time.nanoseconds);
+        self.blob_raster_graph
+            .push(backend_profile.resources.texture_cache.rasterized_blob_pixels.size as u64);
         self.ipc_time.set(backend_profile.ipc.total_time.nanoseconds);
         self.gpu_graph.push(gpu_graph);
         self.gpu_time.set(gpu_graph);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/render_backend.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/render_backend.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/render_backend.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/render_backend.rs	2019-09-15 11:33:11.000000000 +0000
@@ -84,6 +84,13 @@
             self.pinch_zoom_factor
         )
     }
+
+    pub fn accumulated_scale_factor_for_snapping(&self) -> DevicePixelScale {
+        DevicePixelScale::new(
+            self.device_pixel_ratio *
+            self.page_zoom_factor
+        )
+    }
 }
 
 #[derive(Copy, Clone, Hash, MallocSizeOf, PartialEq, PartialOrd, Debug, Eq, Ord)]
@@ -582,6 +589,7 @@
 
             self.clip_scroll_tree.update_tree(
                 pan,
+                accumulated_scale_factor,
                 &self.dynamic_properties,
             );
 
@@ -929,7 +937,8 @@
                             }
 
                             self.resource_cache.add_rasterized_blob_images(
-                                txn.rasterized_blobs.take()
+                                txn.rasterized_blobs.take(),
+                                &mut profile_counters.resources.texture_cache,
                             );
                             if let Some((rasterizer, info)) = txn.blob_rasterizer.take() {
                                 self.resource_cache.set_blob_rasterizer(rasterizer, info);
@@ -1750,6 +1759,8 @@
                 config.serialize(doc.frame_builder.as_ref().unwrap(), file_name);
                 let file_name = format!("scratch-{}-{}", id.namespace_id.0, id.id);
                 config.serialize(&doc.scratch, file_name);
+                let file_name = format!("properties-{}-{}", id.namespace_id.0, id.id);
+                config.serialize(&doc.dynamic_properties, file_name);
                 let file_name = format!("render-tasks-{}-{}.svg", id.namespace_id.0, id.id);
                 let mut svg_file = fs::File::create(&config.file_path(file_name, "svg"))
                     .expect("Failed to open the SVG file.");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/renderer.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/renderer.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/renderer.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/renderer.rs	2019-09-15 11:33:11.000000000 +0000
@@ -621,11 +621,6 @@
                 kind: VertexAttributeKind::F32,
             },
             VertexAttribute {
-                name: "aClipSnapOffsets",
-                count: 4,
-                kind: VertexAttributeKind::F32,
-            },
-            VertexAttribute {
                 name: "aClipOrigins",
                 count: 4,
                 kind: VertexAttributeKind::F32,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/render_target.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/render_target.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/render_target.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/render_target.rs	2019-09-15 11:33:10.000000000 +0000
@@ -663,7 +663,6 @@
                     task_info.actual_rect,
                     &ctx.screen_world_rect,
                     task_info.device_pixel_scale,
-                    task_info.snap_offsets,
                     target_rect.origin.to_f32(),
                     task_info.actual_rect.origin.to_f32(),
                 );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/render_task.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/render_task.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/render_task.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/render_task.rs	2019-09-15 11:33:10.000000000 +0000
@@ -14,7 +14,7 @@
 use crate::frame_builder::FrameBuilderConfig;
 use crate::freelist::{FreeList, FreeListHandle, WeakFreeListHandle};
 use crate::gpu_cache::{GpuCache, GpuCacheAddress, GpuCacheHandle};
-use crate::gpu_types::{BorderInstance, ImageSource, UvRectKind, SnapOffsets};
+use crate::gpu_types::{BorderInstance, ImageSource, UvRectKind};
 use crate::internal_types::{CacheTextureId, FastHashMap, LayerIndex, SavedTargetIndex, TextureSource};
 use crate::prim_store::{PictureIndex, PrimitiveVisibilityMask};
 use crate::prim_store::image::ImageCacheKey;
@@ -125,7 +125,6 @@
     pub actual_rect: DeviceIntRect,
     pub root_spatial_node_index: SpatialNodeIndex,
     pub clip_node_range: ClipNodeRange,
-    pub snap_offsets: SnapOffsets,
     pub device_pixel_scale: DevicePixelScale,
 }
 
@@ -523,7 +522,6 @@
         resource_cache: &mut ResourceCache,
         render_tasks: &mut RenderTaskGraph,
         clip_data_store: &mut ClipDataStore,
-        snap_offsets: SnapOffsets,
         device_pixel_scale: DevicePixelScale,
         fb_config: &FrameBuilderConfig,
     ) -> Self {
@@ -617,7 +615,6 @@
                 actual_rect: outer_rect,
                 clip_node_range,
                 root_spatial_node_index,
-                snap_offsets,
                 device_pixel_scale,
             }),
             clear_mode,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/resource_cache.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/resource_cache.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/resource_cache.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/resource_cache.rs	2019-09-15 11:33:11.000000000 +0000
@@ -743,7 +743,11 @@
         }
     }
 
-    pub fn add_rasterized_blob_images(&mut self, images: Vec<(BlobImageRequest, BlobImageResult)>) {
+    pub fn add_rasterized_blob_images(
+        &mut self,
+        images: Vec<(BlobImageRequest, BlobImageResult)>,
+        texture_cache_profile: &mut TextureCacheProfileCounters,
+    ) {
         for (request, result) in images {
             let data = match result {
                 Ok(data) => data,
@@ -753,6 +757,8 @@
                 }
             };
 
+            texture_cache_profile.rasterized_blob_pixels.inc(data.rasterized_rect.area() as usize);
+
             // First make sure we have an entry for this key (using a placeholder
             // if need be).
             let image = self.rasterized_blob_images.entry(request.key).or_insert_with(
@@ -1604,13 +1610,16 @@
             texture_cache_profile,
         );
 
-        self.rasterize_missing_blob_images();
+        self.rasterize_missing_blob_images(texture_cache_profile);
 
         // Apply any updates of new / updated images (incl. blobs) to the texture cache.
         self.update_texture_cache(gpu_cache);
     }
 
-    fn rasterize_missing_blob_images(&mut self) {
+    fn rasterize_missing_blob_images(
+        &mut self,
+        texture_cache_profile: &mut TextureCacheProfileCounters,
+    ) {
         if self.missing_blob_images.is_empty() {
             return;
         }
@@ -1632,7 +1641,7 @@
             .unwrap()
             .rasterize(&self.missing_blob_images, is_low_priority);
 
-        self.add_rasterized_blob_images(rasterized_blobs);
+        self.add_rasterized_blob_images(rasterized_blobs, texture_cache_profile);
 
         self.missing_blob_images.clear();
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/spatial_node.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/spatial_node.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/spatial_node.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/spatial_node.rs	2019-09-15 11:33:11.000000000 +0000
@@ -7,9 +7,9 @@
 use api::{TransformStyle, ScrollSensitivity, StickyOffsetBounds};
 use api::units::*;
 use crate::clip_scroll_tree::{CoordinateSystem, CoordinateSystemId, SpatialNodeIndex, TransformUpdateState};
-use euclid::SideOffsets2D;
+use euclid::{Scale, SideOffsets2D};
 use crate::scene::SceneProperties;
-use crate::util::{LayoutFastTransform, MatrixHelpers, ScaleOffset, TransformedRectKind};
+use crate::util::{LayoutFastTransform, MatrixHelpers, ScaleOffset, TransformedRectKind, VectorHelpers};
 
 #[derive(Clone, Debug)]
 pub enum SpatialNodeType {
@@ -38,6 +38,10 @@
     /// Content scale/offset relative to the coordinate system.
     pub content_transform: ScaleOffset,
 
+    /// Snapping scale/offset relative to the coordinate system. If None, then
+    /// we should not snap entities bound to this spatial node.
+    pub snapping_transform: Option<ScaleOffset>,
+
     /// The axis-aligned coordinate system id of this node.
     pub coordinate_system_id: CoordinateSystemId,
 
@@ -102,6 +106,23 @@
     offset
 }
 
+/// Snap an offset to be incorporated into a transform, where the local space
+/// may be considered the world space. We convert from world space to device
+/// space using the global device pixel scale, which may not always be correct
+/// if there are intermediate surfaces used, however those are either cases
+/// where snapping is not important (e.g. has perspective or is not axis
+/// aligned), or an edge case (e.g. SVG filters) which we can accept
+/// imperfection for now.
+fn snap_offset(
+    offset: LayoutVector2D,
+    global_device_pixel_scale: DevicePixelScale,
+) -> LayoutVector2D {
+    let world_offset = offset * Scale::new(1.0);
+    let snapped_device_offset = (world_offset * global_device_pixel_scale).snap();
+    let snapped_world_offset = snapped_device_offset / global_device_pixel_scale;
+    snapped_world_offset * Scale::new(1.0)
+}
+
 impl SpatialNode {
     pub fn new(
         pipeline_id: PipelineId,
@@ -111,6 +132,7 @@
         SpatialNode {
             viewport_transform: ScaleOffset::identity(),
             content_transform: ScaleOffset::identity(),
+            snapping_transform: None,
             coordinate_system_id: CoordinateSystemId(0),
             transform_kind: TransformedRectKind::AxisAligned,
             parent: parent_index,
@@ -243,6 +265,7 @@
         &mut self,
         state: &mut TransformUpdateState,
         coord_systems: &mut Vec<CoordinateSystem>,
+        global_device_pixel_scale: DevicePixelScale,
         scene_properties: &SceneProperties,
         previous_spatial_nodes: &[SpatialNode],
     ) {
@@ -253,7 +276,7 @@
             return;
         }
 
-        self.update_transform(state, coord_systems, scene_properties, previous_spatial_nodes);
+        self.update_transform(state, coord_systems, global_device_pixel_scale, scene_properties, previous_spatial_nodes);
         //TODO: remove the field entirely?
         self.transform_kind = if self.coordinate_system_id.0 == 0 {
             TransformedRectKind::AxisAligned
@@ -283,6 +306,7 @@
         &mut self,
         state: &mut TransformUpdateState,
         coord_systems: &mut Vec<CoordinateSystem>,
+        global_device_pixel_scale: DevicePixelScale,
         scene_properties: &SceneProperties,
         previous_spatial_nodes: &[SpatialNode],
     ) {
@@ -325,7 +349,7 @@
                     // between our reference frame and this node. Finally, we also include
                     // whatever local transformation this reference frame provides.
                     let relative_transform = resolved_transform
-                        .post_translate(state.parent_accumulated_scroll_offset)
+                        .post_translate(snap_offset(state.parent_accumulated_scroll_offset, global_device_pixel_scale))
                         .to_transform()
                         .with_destination::<LayoutPixel>();
 
@@ -400,13 +424,13 @@
                 // provided by our own sticky positioning.
                 let accumulated_offset = state.parent_accumulated_scroll_offset + sticky_offset;
                 self.viewport_transform = state.coordinate_system_relative_scale_offset
-                    .offset(accumulated_offset.to_untyped());
+                    .offset(snap_offset(accumulated_offset, global_device_pixel_scale).to_untyped());
 
                 // The transformation for any content inside of us is the viewport transformation, plus
                 // whatever scrolling offset we supply as well.
                 let added_offset = accumulated_offset + self.scroll_offset();
                 self.content_transform = state.coordinate_system_relative_scale_offset
-                    .offset(added_offset.to_untyped());
+                    .offset(snap_offset(added_offset, global_device_pixel_scale).to_untyped());
 
                 if let SpatialNodeType::StickyFrame(ref mut info) = self.node_type {
                     info.current_offset = sticky_offset;
@@ -635,6 +659,55 @@
         }
     }
 
+    /// Updates the snapping transform.
+    pub fn update_snapping(
+        &mut self,
+        parent: Option<&SpatialNode>,
+    ) {
+        // Reset in case of an early return.
+        self.snapping_transform = None;
+
+        // We need to incorporate the parent scale/offset with the child.
+        // If the parent does not have a scale/offset, then we know we are
+        // not 2d axis aligned and thus do not need to snap its children
+        // either.
+        let parent_scale_offset = match parent {
+            Some(parent) => {
+                match parent.snapping_transform {
+                    Some(scale_offset) => scale_offset,
+                    None => return,
+                }
+            },
+            _ => ScaleOffset::identity(),
+        };
+
+        let scale_offset = match self.node_type {
+            SpatialNodeType::ReferenceFrame(ref info) => {
+                match info.source_transform {
+                    PropertyBinding::Value(ref value) => {
+                        // We can only get a ScaleOffset if the transform is 2d axis
+                        // aligned.
+                        match ScaleOffset::from_transform(value) {
+                            Some(scale_offset) => {
+                                let origin_offset = info.origin_in_parent_reference_frame;
+                                ScaleOffset::from_offset(origin_offset.to_untyped())
+                                    .accumulate(&scale_offset)
+                            }
+                            None => return,
+                        }
+                    }
+
+                    // Assume animations start at the identity transform for snapping purposes.
+                    // TODO(aosmond): Is there a better known starting point?
+                    PropertyBinding::Binding(..) => ScaleOffset::identity(),
+                }
+            }
+            _ => ScaleOffset::identity(),
+        };
+
+        self.snapping_transform = Some(parent_scale_offset.accumulate(&scale_offset));
+    }
+
     /// Returns true for ReferenceFrames whose source_transform is
     /// bound to the property binding id.
     pub fn is_transform_bound_to_property(&self, id: PropertyBindingId) -> bool {
@@ -850,7 +923,7 @@
         pipeline_id,
     );
 
-    cst.update_tree(WorldPoint::zero(), &SceneProperties::new());
+    cst.update_tree(WorldPoint::zero(), DevicePixelScale::new(1.0), &SceneProperties::new());
 
     let scroll_offset = compute_offset_from(
         cst.spatial_nodes[ref_frame.0 as usize].parent,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/util.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/util.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender/src/util.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender/src/util.rs	2019-09-15 11:33:11.000000000 +0000
@@ -166,6 +166,13 @@
         })
     }
 
+    pub fn from_offset(offset: default::Vector2D<f32>) -> Self {
+        ScaleOffset {
+            scale: Vector2D::new(1.0, 1.0),
+            offset,
+        }
+    }
+
     pub fn inverse(&self) -> Self {
         ScaleOffset {
             scale: Vector2D::new(
@@ -188,6 +195,15 @@
         )
     }
 
+    pub fn scale(&self, scale: f32) -> Self {
+        self.accumulate(
+            &ScaleOffset {
+                scale: Vector2D::new(scale, scale),
+                offset: Vector2D::zero(),
+            }
+        )
+    }
+
     /// Produce a ScaleOffset that includes both self and other.
     /// The 'self' ScaleOffset is applied after other.
     /// This is equivalent to `Transform3D::pre_transform`.
@@ -405,12 +421,29 @@
     }
 }
 
+pub trait PointHelpers<U>
+where
+    Self: Sized,
+{
+    fn snap(&self) -> Self;
+}
+
+impl<U> PointHelpers<U> for Point2D<f32, U> {
+    fn snap(&self) -> Self {
+        Point2D::new(
+            (self.x + 0.5).floor(),
+            (self.y + 0.5).floor(),
+        )
+    }
+}
+
 pub trait RectHelpers<U>
 where
     Self: Sized,
 {
     fn from_floats(x0: f32, y0: f32, x1: f32, y1: f32) -> Self;
     fn is_well_formed_and_nonempty(&self) -> bool;
+    fn snap(&self) -> Self;
 }
 
 impl<U> RectHelpers<U> for Rect<f32, U> {
@@ -424,6 +457,36 @@
     fn is_well_formed_and_nonempty(&self) -> bool {
         self.size.width > 0.0 && self.size.height > 0.0
     }
+
+    fn snap(&self) -> Self {
+        let origin = Point2D::new(
+            (self.origin.x + 0.5).floor(),
+            (self.origin.y + 0.5).floor(),
+        );
+        Rect::new(
+            origin,
+            Size2D::new(
+                (self.origin.x + self.size.width + 0.5).floor() - origin.x,
+                (self.origin.y + self.size.height + 0.5).floor() - origin.y,
+            ),
+        )
+    }
+}
+
+pub trait VectorHelpers<U>
+where
+    Self: Sized,
+{
+    fn snap(&self) -> Self;
+}
+
+impl<U> VectorHelpers<U> for Vector2D<f32, U> {
+    fn snap(&self) -> Self {
+        Vector2D::new(
+            (self.x + 0.5).floor(),
+            (self.y + 0.5).floor(),
+        )
+    }
 }
 
 pub fn lerp(a: f32, b: f32, t: f32) -> f32 {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender_api/src/display_item.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender_api/src/display_item.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender_api/src/display_item.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender_api/src/display_item.rs	2019-09-15 11:33:11.000000000 +0000
@@ -104,6 +104,7 @@
     Gradient(GradientDisplayItem),
     RadialGradient(RadialGradientDisplayItem),
     Image(ImageDisplayItem),
+    RepeatingImage(RepeatingImageDisplayItem),
     YuvImage(YuvImageDisplayItem),
     BackdropFilter(BackdropFilterDisplayItem),
 
@@ -148,6 +149,7 @@
     Gradient(GradientDisplayItem),
     RadialGradient(RadialGradientDisplayItem),
     Image(ImageDisplayItem),
+    RepeatingImage(RepeatingImageDisplayItem),
     YuvImage(YuvImageDisplayItem),
     BackdropFilter(BackdropFilterDisplayItem),
 
@@ -1071,8 +1073,10 @@
     pub ignore_missing_pipeline: bool,
 }
 
-/// This describes an image or, more generally, a background-image and its tiling.
-/// (A background-image repeats in a grid to fill the specified area).
+/// This describes an image that fills the specified area. It stretches or shrinks
+/// the image as necessary. While RepeatingImageDisplayItem could otherwise provide
+/// a superset of the functionality, it has been problematic inferring the desired
+/// repetition properties when snapping changes the size of the primitive.
 #[derive(Clone, Copy, Debug, Default, Deserialize, PartialEq, Serialize, PeekPoke)]
 pub struct ImageDisplayItem {
     pub common: CommonItemProperties,
@@ -1080,6 +1084,22 @@
     // FIXME: this should ideally just be `tile_origin` here, with the clip_rect
     // defining the bounds of the item. Needs non-trivial backend changes.
     pub bounds: LayoutRect,
+    pub image_key: ImageKey,
+    pub image_rendering: ImageRendering,
+    pub alpha_type: AlphaType,
+    /// A hack used by gecko to color a simple bitmap font used for tofu glyphs
+    pub color: ColorF,
+}
+
+/// This describes a background-image and its tiling. It repeats in a grid to fill
+/// the specified area.
+#[derive(Clone, Copy, Debug, Default, Deserialize, PartialEq, Serialize, PeekPoke)]
+pub struct RepeatingImageDisplayItem {
+    pub common: CommonItemProperties,
+    /// The area to tile the image over (first tile starts at origin of this rect)
+    // FIXME: this should ideally just be `tile_origin` here, with the clip_rect
+    // defining the bounds of the item. Needs non-trivial backend changes.
+    pub bounds: LayoutRect,
     /// How large to make a single tile of the image (common case: bounds.size)
     pub stretch_size: LayoutSize,
     /// The space between tiles (common case: 0)
@@ -1406,6 +1426,7 @@
             DisplayItem::Gradient(..) => "gradient",
             DisplayItem::Iframe(..) => "iframe",
             DisplayItem::Image(..) => "image",
+            DisplayItem::RepeatingImage(..) => "repeating_image",
             DisplayItem::Line(..) => "line",
             DisplayItem::PopAllShadows => "pop_all_shadows",
             DisplayItem::PopReferenceFrame => "pop_reference_frame",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender_api/src/display_list.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender_api/src/display_list.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/webrender_api/src/display_list.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/webrender_api/src/display_list.rs	2019-09-15 11:33:11.000000000 +0000
@@ -623,6 +623,7 @@
                 Real::HitTest(v) => Debug::HitTest(v),
                 Real::Line(v) => Debug::Line(v),
                 Real::Image(v) => Debug::Image(v),
+                Real::RepeatingImage(v) => Debug::RepeatingImage(v),
                 Real::YuvImage(v) => Debug::YuvImage(v),
                 Real::Border(v) => Debug::Border(v),
                 Real::BoxShadow(v) => Debug::BoxShadow(v),
@@ -727,6 +728,7 @@
                 Debug::HitTest(v) => Real::HitTest(v),
                 Debug::Line(v) => Real::Line(v),
                 Debug::Image(v) => Real::Image(v),
+                Debug::RepeatingImage(v) => Real::RepeatingImage(v),
                 Debug::YuvImage(v) => Real::YuvImage(v),
                 Debug::Border(v) => Real::Border(v),
                 Debug::BoxShadow(v) => Real::BoxShadow(v),
@@ -1004,6 +1006,27 @@
         &mut self,
         common: &di::CommonItemProperties,
         bounds: LayoutRect,
+        image_rendering: di::ImageRendering,
+        alpha_type: di::AlphaType,
+        key: ImageKey,
+        color: ColorF,
+    ) {
+        let item = di::DisplayItem::Image(di::ImageDisplayItem {
+            common: *common,
+            bounds,
+            image_key: key,
+            image_rendering,
+            alpha_type,
+            color,
+        });
+
+        self.push_item(&item);
+    }
+
+    pub fn push_repeating_image(
+        &mut self,
+        common: &di::CommonItemProperties,
+        bounds: LayoutRect,
         stretch_size: LayoutSize,
         tile_spacing: LayoutSize,
         image_rendering: di::ImageRendering,
@@ -1011,7 +1034,7 @@
         key: ImageKey,
         color: ColorF,
     ) {
-        let item = di::DisplayItem::Image(di::ImageDisplayItem {
+        let item = di::DisplayItem::RepeatingImage(di::RepeatingImageDisplayItem {
             common: *common,
             bounds,
             image_key: key,
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/border/degenerate-curve.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/border/degenerate-curve.png differ
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/boxshadow/inset-mask-region.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/boxshadow/inset-mask-region.png differ
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/boxshadow/inset-subpx.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/boxshadow/inset-subpx.png differ
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/boxshadow/scale.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/boxshadow/scale.png differ
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/clip/clip-45-degree-rotation-ref.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/clip/clip-45-degree-rotation-ref.png differ
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/clip/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/clip/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/clip/reftest.list	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/clip/reftest.list	2019-09-15 11:33:11.000000000 +0000
@@ -9,7 +9,7 @@
 == fixed-position-clipping.yaml fixed-position-clipping-ref.yaml
 platform(linux,mac) == segmentation-with-other-coordinate-system-clip.yaml segmentation-with-other-coordinate-system-clip.png
 skip_on(android,emulator) == segmentation-across-rotation.yaml segmentation-across-rotation-ref.yaml
-== color_targets(3) alpha_targets(1) stacking-context-clip.yaml stacking-context-clip-ref.yaml
+skip_on(android,device) == color_targets(3) alpha_targets(1) stacking-context-clip.yaml stacking-context-clip-ref.yaml
 == snapping.yaml snapping-ref.yaml
 skip_on(android,emulator) fuzzy(70,2400) == clip-and-filter-with-rotation.yaml clip-and-filter-with-rotation-ref.yaml
-color_targets(1) alpha_targets(0) == clip-out-rotation.yaml blank.yaml
+color_targets(2) alpha_targets(0) == clip-out-rotation.yaml blank.yaml # Unexpected color targets, see bug 1580795
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/clip/segmentation-with-other-coordinate-system-clip.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/clip/segmentation-with-other-coordinate-system-clip.png differ
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/filters/backdrop-filter-perspective.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/filters/backdrop-filter-perspective.png differ
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/filters/filter-drop-shadow-clip.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/filters/filter-drop-shadow-clip.png differ
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/performance/no-clip-mask.yaml firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/performance/no-clip-mask.yaml
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/performance/no-clip-mask.yaml	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/performance/no-clip-mask.yaml	2019-09-15 11:33:11.000000000 +0000
@@ -21,3 +21,4 @@
         bounds: [1075, -1, 12, 199]
         "clip-rect": [1075, -1, 12, 199]
         image: checkerboard(4, 8, 8)
+        stretch-size: 72 72
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/transforms/near-plane-clip.yaml firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/transforms/near-plane-clip.yaml
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/transforms/near-plane-clip.yaml	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/transforms/near-plane-clip.yaml	2019-09-15 11:33:11.000000000 +0000
@@ -15,3 +15,4 @@
             -
               bounds: [350, 200, 260, 300]
               image: checkerboard(2, 16, 16)
+              stretch-size: 260 260
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/transforms/nested-preserve-3d.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/transforms/nested-preserve-3d.png differ
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/transforms/nested-rotate-x.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/transforms/nested-rotate-x.png differ
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/transforms/perspective-clip-1.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/transforms/perspective-clip-1.png differ
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/transforms/perspective-shadow.png and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/transforms/perspective-shadow.png differ
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/transforms/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/transforms/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/reftests/transforms/reftest.list	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/reftests/transforms/reftest.list	2019-09-15 11:33:10.000000000 +0000
@@ -22,7 +22,7 @@
 platform(linux,mac) == nested-preserve-3d.yaml nested-preserve-3d.png
 platform(linux,mac) fuzzy(1,283) == near-plane-clip.yaml near-plane-clip.png
 platform(linux,mac) == perspective-mask.yaml perspective-mask.png
-rotate-clip.yaml rotate-clip-ref.yaml
+skip_on(android,emulator) == rotate-clip.yaml rotate-clip-ref.yaml # Fails on Android emulator
 skip_on(android,emulator) == clip-translate.yaml clip-translate-ref.yaml  # Fails on Android emulator
 platform(linux,mac) == perspective-clip.yaml perspective-clip.png
 platform(linux,mac) fuzzy(1,2) == perspective-clip-1.yaml perspective-clip-1.png
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/src/rawtest.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/src/rawtest.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/src/rawtest.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/src/rawtest.rs	2019-09-15 11:33:11.000000000 +0000
@@ -163,8 +163,6 @@
         builder.push_image(
             &info,
             info.clip_rect,
-            size2(64.0, 64.0),
-            size2(64.0, 64.0),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             img,
@@ -192,8 +190,6 @@
         builder.push_image(
             &info,
             info.clip_rect,
-            size2(1024.0, 1024.0),
-            size2(1024.0, 1024.0),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             img,
@@ -218,8 +214,6 @@
         builder.push_image(
             &info,
             info.clip_rect,
-            size2(1024.0, 1024.0),
-            size2(1024.0, 1024.0),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             img,
@@ -255,7 +249,7 @@
         let info = self.make_common_properties(rect(448.899994, 74.0, 151.000031, 56.));
 
         // setup some malicious image size parameters
-        builder.push_image(
+        builder.push_repeating_image(
             &info,
             info.clip_rect,
             size2(151., 56.0),
@@ -335,7 +329,7 @@
         };
 
         // setup some malicious image size parameters
-        builder.push_image(
+        builder.push_repeating_image(
             &info,
             info.clip_rect,
             image_size * 2.,
@@ -440,7 +434,7 @@
             Some(100),
         );
 
-        builder.push_image(
+        builder.push_repeating_image(
             &info,
             info.clip_rect,
             image_size,
@@ -477,7 +471,7 @@
             Some(100),
         );
 
-        builder.push_image(
+        builder.push_repeating_image(
             &info,
             info.clip_rect,
             image_size,
@@ -532,7 +526,7 @@
         let image_size = size2(1510., 1510.);
 
         // setup some malicious image size parameters
-        builder.push_image(
+        builder.push_repeating_image(
             &info,
             info.clip_rect,
             image_size,
@@ -558,7 +552,7 @@
         let image_size = size2(1510., 1510.);
 
         // setup some malicious image size parameters
-        builder.push_image(
+        builder.push_repeating_image(
             &info,
             info.clip_rect,
             image_size,
@@ -590,7 +584,7 @@
         let image_size = size2(1510., 1510.);
 
         // setup some malicious image size parameters
-        builder.push_image(
+        builder.push_repeating_image(
             &info,
             info.clip_rect,
             image_size,
@@ -656,8 +650,6 @@
         builder.push_image(
             &info,
             info.clip_rect,
-            size2(200.0, 200.0),
-            size2(0.0, 0.0),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             blob_img.as_image(),
@@ -680,8 +672,6 @@
         builder.push_image(
             &info,
             info.clip_rect,
-            size2(200.0, 200.0),
-            size2(0.0, 0.0),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             blob_img.as_image(),
@@ -767,8 +757,6 @@
             builder.push_image(
                 &info,
                 info.clip_rect,
-                size2(200.0, 200.0),
-                size2(0.0, 0.0),
                 ImageRendering::Auto,
                 AlphaType::PremultipliedAlpha,
                 blob_img.as_image(),
@@ -777,8 +765,6 @@
             builder.push_image(
                 &info2,
                 info2.clip_rect,
-                size2(200.0, 200.0),
-                size2(0.0, 0.0),
                 ImageRendering::Auto,
                 AlphaType::PremultipliedAlpha,
                 blob_img2.as_image(),
@@ -870,8 +856,6 @@
         builder.push_image(
             &info,
             info.clip_rect,
-            size2(200.0, 200.0),
-            size2(0.0, 0.0),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             blob_img.as_image(),
@@ -899,8 +883,6 @@
         builder.push_image(
             &info,
             info.clip_rect,
-            size2(200.0, 200.0),
-            size2(0.0, 0.0),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             blob_img.as_image(),
@@ -926,8 +908,6 @@
         builder.push_image(
             &info,
             info.clip_rect,
-            size2(200.0, 200.0),
-            size2(0.0, 0.0),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             blob_img.as_image(),
@@ -1126,8 +1106,6 @@
         builder.push_image(
             &info,
             info.clip_rect,
-            size2(150.0, 50.0),
-            size2(0.0, 0.0),
             ImageRendering::Auto,
             AlphaType::PremultipliedAlpha,
             image,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/src/yaml_frame_reader.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/src/yaml_frame_reader.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/src/yaml_frame_reader.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/src/yaml_frame_reader.rs	2019-09-15 11:33:11.000000000 +0000
@@ -1374,10 +1374,6 @@
                 item["bounds"]
             );
         };
-        let stretch_size = item["stretch-size"].as_size().unwrap_or(image_dims);
-        let tile_spacing = item["tile-spacing"]
-            .as_size()
-            .unwrap_or(LayoutSize::new(0.0, 0.0));
         let rendering = match item["rendering"].as_str() {
             Some("auto") | None => ImageRendering::Auto,
             Some("crisp-edges") => ImageRendering::CrispEdges,
@@ -1395,16 +1391,29 @@
                 item
             ),
         };
-        dl.push_image(
-            &info,
-            bounds,
-            stretch_size,
-            tile_spacing,
-            rendering,
-            alpha_type,
-            image_key,
-            ColorF::WHITE,
-        );
+        let stretch_size = item["stretch-size"].as_size();
+        let tile_spacing = item["tile-spacing"].as_size();
+        if stretch_size.is_none() && tile_spacing.is_none() {
+            dl.push_image(
+                &info,
+                bounds,
+                rendering,
+                alpha_type,
+                image_key,
+                ColorF::WHITE,
+           );
+        } else {
+            dl.push_repeating_image(
+                &info,
+                bounds,
+                stretch_size.unwrap_or(image_dims),
+                tile_spacing.unwrap_or(LayoutSize::zero()),
+                rendering,
+                alpha_type,
+                image_key,
+                ColorF::WHITE,
+           );
+        }
     }
 
     fn handle_text(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/src/yaml_frame_writer.rs firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/src/yaml_frame_writer.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/gfx/wr/wrench/src/yaml_frame_writer.rs	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/gfx/wr/wrench/src/yaml_frame_writer.rs	2019-09-15 11:33:10.000000000 +0000
@@ -1065,6 +1065,29 @@
                     {
                         u32_node(&mut v, "tile-size", tile_size as u32);
                     }
+                    match item.image_rendering {
+                        ImageRendering::Auto => (),
+                        ImageRendering::CrispEdges => str_node(&mut v, "rendering", "crisp-edges"),
+                        ImageRendering::Pixelated => str_node(&mut v, "rendering", "pixelated"),
+                    };
+                    match item.alpha_type {
+                        AlphaType::PremultipliedAlpha => str_node(&mut v, "alpha-type", "premultiplied-alpha"),
+                        AlphaType::Alpha => str_node(&mut v, "alpha-type", "alpha"),
+                    };
+                }
+                DisplayItem::RepeatingImage(item) => {
+                    common_node(&mut v, clip_id_mapper, &item.common);
+                    rect_node(&mut v, "bounds", &item.bounds);
+                    if let Some(path) = self.path_for_image(item.image_key) {
+                        path_node(&mut v, "image", &path);
+                    }
+                    if let Some(&CachedImage {
+                        tiling: Some(tile_size),
+                        ..
+                    }) = self.images.get(&item.image_key)
+                    {
+                        u32_node(&mut v, "tile-size", tile_size as u32);
+                    }
                     size_node(&mut v, "stretch-size", &item.stretch_size);
                     size_node(&mut v, "tile-spacing", &item.tile_spacing);
                     match item.image_rendering {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/image/SurfaceCache.cpp firefox-trunk-71.0~a1~hg20190915r493291/image/SurfaceCache.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/image/SurfaceCache.cpp	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/image/SurfaceCache.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -1391,6 +1391,11 @@
   uint64_t surfaceCacheMaxSizeKB =
       StaticPrefs::image_mem_surfacecache_max_size_kb_AtStartup();
 
+  if (sizeof(uintptr_t) <= 4) {
+    // Limit surface cache to 1 GB if our address space is 32 bit.
+    surfaceCacheMaxSizeKB = 1024 * 1024;
+  }
+
   // A knob determining the actual size of the surface cache. Currently the
   // cache is (size of main memory) / (surface cache size factor) KB
   // or (surface cache max size) KB, whichever is smaller. The formula
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/image/test/browser/browser.ini firefox-trunk-71.0~a1~hg20190915r493291/image/test/browser/browser.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/image/test/browser/browser.ini	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/image/test/browser/browser.ini	2019-09-15 11:33:11.000000000 +0000
@@ -14,6 +14,5 @@
 skip-if = true # Bug 987616
 [browser_docshell_type_editor.js]
 [browser_offscreen_image_in_out_of_process_iframe.js]
-skip-if = (webrender && os == 'win') # bug 1580703
 support-files =
   empty.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/image/test/browser/browser_offscreen_image_in_out_of_process_iframe.js firefox-trunk-71.0~a1~hg20190915r493291/image/test/browser/browser_offscreen_image_in_out_of_process_iframe.js
--- firefox-trunk-71.0~a1~hg20190913r492975/image/test/browser/browser_offscreen_image_in_out_of_process_iframe.js	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/image/test/browser/browser_offscreen_image_in_out_of_process_iframe.js	2019-09-15 11:33:11.000000000 +0000
@@ -43,7 +43,7 @@
 
       // Make a space bigger than display port.
       const spacer = content.document.createElement("div");
-      spacer.style = "width: 100%; height: 5000px;";
+      spacer.style = "width: 100%; height: 10000px;";
       scroller.appendChild(spacer);
 
       const iframe = content.document.createElement("iframe");
@@ -65,7 +65,7 @@
       content.document.body.appendChild(img);
 
       const spacer = content.document.createElement("div");
-      spacer.style = "width: 100%; height: 5000px;";
+      spacer.style = "width: 100%; height: 10000px;";
       content.document.body.appendChild(spacer);
       await new Promise(resolve => {
         img.addEventListener("load", resolve, { once: true });
@@ -129,7 +129,7 @@
     // Scroll the iframe into view.
     await SpecialPowers.spawn(browser, [], async () => {
       const scroller = content.document.getElementById("scroller");
-      scroller.scrollTo({ left: 0, top: 4800, behavior: "smooth" });
+      scroller.scrollTo({ left: 0, top: 9800, behavior: "smooth" });
       await new Promise(resolve => content.window.setTimeout(resolve, 1000));
     });
 
@@ -144,7 +144,7 @@
       const img = content.document.getElementById("img");
       // Move the image outside of the scroll port.  'position: absolute' causes
       // a relow on the image element.
-      img.style = "position: absolute; top: 4000px;";
+      img.style = "position: absolute; top: 9000px;";
       await new Promise(resolve =>
         content.window.requestAnimationFrame(resolve)
       );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/intl/l10n/Localization.h firefox-trunk-71.0~a1~hg20190915r493291/intl/l10n/Localization.h
--- firefox-trunk-71.0~a1~hg20190913r492975/intl/l10n/Localization.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/intl/l10n/Localization.h	2019-09-15 11:33:11.000000000 +0000
@@ -72,7 +72,7 @@
  protected:
   virtual ~Localization();
   void RegisterObservers();
-  void OnChange();
+  virtual void OnChange();
   already_AddRefed<Promise> MaybeWrapPromise(Promise* aInnerPromise);
   void ConvertL10nArgsToJSValue(JSContext* aCx, const L10nArgs& aArgs,
                                 JS::MutableHandle<JS::Value> aRetVal,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/DebugAPI.h firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/DebugAPI.h
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/DebugAPI.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/DebugAPI.h	2019-09-15 11:33:11.000000000 +0000
@@ -8,6 +8,7 @@
 #define debugger_DebugAPI_h
 
 #include "vm/GlobalObject.h"
+#include "vm/Interpreter.h"
 #include "vm/JSContext.h"
 
 namespace js {
@@ -68,10 +69,6 @@
 class DebugScript;
 class DebuggerVector;
 
-using CompartmentSet =
-    HashSet<JS::Compartment*, DefaultHasher<JS::Compartment*>,
-            SystemAllocPolicy>;
-
 class DebugAPI {
  public:
   friend class Debugger;
@@ -107,11 +104,6 @@
   // Add sweep group edges due to the presence of any debuggers.
   static MOZ_MUST_USE bool findSweepGroupEdges(JSRuntime* rt);
 
-  // Find the target compartments of cross compartment edges.
-  static bool findCrossCompartmentTargets(JSRuntime* rt,
-                                          JS::Compartment* source,
-                                          CompartmentSet& targets);
-
   // Sweep breakpoints in a script associated with any debugger.
   static inline void sweepBreakpoints(JSFreeOp* fop, JSScript* script);
 
@@ -213,6 +205,9 @@
    */
   static inline ResumeMode onResumeFrame(JSContext* cx, AbstractFramePtr frame);
 
+  static inline ResumeMode onNativeCall(JSContext* cx, const CallArgs& args,
+                                        CallReason reason);
+
   /*
    * Announce to the debugger a |debugger;| statement on has been
    * encountered on the youngest JS frame on |cx|. Call whatever hooks have
@@ -377,6 +372,8 @@
   static ResumeMode slowPathOnEnterFrame(JSContext* cx, AbstractFramePtr frame);
   static ResumeMode slowPathOnResumeFrame(JSContext* cx,
                                           AbstractFramePtr frame);
+  static ResumeMode slowPathOnNativeCall(JSContext* cx, const CallArgs& args,
+                                         CallReason reason);
   static ResumeMode slowPathOnDebuggerStatement(JSContext* cx,
                                                 AbstractFramePtr frame);
   static ResumeMode slowPathOnExceptionUnwind(JSContext* cx,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/DebugAPI-inl.h firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/DebugAPI-inl.h
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/DebugAPI-inl.h	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/DebugAPI-inl.h	2019-09-15 11:33:12.000000000 +0000
@@ -132,6 +132,15 @@
 }
 
 /* static */
+ResumeMode DebugAPI::onNativeCall(JSContext* cx, const CallArgs& args,
+                                  CallReason reason) {
+  if (!cx->realm()->isDebuggee()) {
+    return ResumeMode::Continue;
+  }
+  return slowPathOnNativeCall(cx, args, reason);
+}
+
+/* static */
 ResumeMode DebugAPI::onDebuggerStatement(JSContext* cx,
                                          AbstractFramePtr frame) {
   if (!cx->realm()->isDebuggee()) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/Debugger.cpp firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/Debugger.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/Debugger.cpp	2019-09-13 05:13:16.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/Debugger.cpp	2019-09-15 11:33:12.000000000 +0000
@@ -842,6 +842,40 @@
   return slowPathOnEnterFrame(cx, frame);
 }
 
+/* static */
+ResumeMode DebugAPI::slowPathOnNativeCall(JSContext* cx, const CallArgs& args,
+                                          CallReason reason) {
+  RootedValue rval(cx);
+  ResumeMode resumeMode = Debugger::dispatchHook(
+      cx,
+      [cx](Debugger* dbg) -> bool {
+        return dbg == cx->insideDebuggerEvaluationWithOnNativeCallHook &&
+          dbg->getHook(Debugger::OnNativeCall);
+      },
+      [&](Debugger* dbg) -> ResumeMode {
+        return dbg->fireNativeCall(cx, args, reason, &rval);
+      });
+
+  switch (resumeMode) {
+    case ResumeMode::Continue:
+      break;
+
+    case ResumeMode::Throw:
+      cx->setPendingExceptionAndCaptureStack(rval);
+      break;
+
+    case ResumeMode::Terminate:
+      cx->clearPendingException();
+      break;
+
+    case ResumeMode::Return:
+      args.rval().set(rval);
+      break;
+  }
+
+  return resumeMode;
+}
+
 /*
  * RAII class to mark a generator as "running" temporarily while running
  * debugger code.
@@ -1755,7 +1789,7 @@
 
   RootedValue thisv(cx);
   Maybe<HandleValue> maybeThisv;
-  if (!GetThisValueForCheck(cx, frame, pc, &thisv, maybeThisv)) {
+  if (frame && !GetThisValueForCheck(cx, frame, pc, &thisv, maybeThisv)) {
     ar.reset();
     return ResumeMode::Terminate;
   }
@@ -2158,6 +2192,44 @@
                               vp);
 }
 
+ResumeMode Debugger::fireNativeCall(JSContext* cx, const CallArgs& args,
+                                    CallReason reason, MutableHandleValue vp) {
+  RootedObject hook(cx, getHook(OnNativeCall));
+  MOZ_ASSERT(hook);
+  MOZ_ASSERT(hook->isCallable());
+
+  Maybe<AutoRealm> ar;
+  ar.emplace(cx, object);
+
+  RootedValue fval(cx, ObjectValue(*hook));
+  RootedValue calleeval(cx, args.calleev());
+  if (!wrapDebuggeeValue(cx, &calleeval)) {
+    return reportUncaughtException(ar);
+  }
+
+  JSAtom* reasonAtom = nullptr;
+  switch (reason) {
+    case CallReason::Call:
+      reasonAtom = cx->names().call;
+      break;
+    case CallReason::Getter:
+      reasonAtom = cx->names().get;
+      break;
+    case CallReason::Setter:
+      reasonAtom = cx->names().set;
+      break;
+  }
+  cx->markAtom(reasonAtom);
+
+  RootedValue reasonval(cx, StringValue(reasonAtom));
+
+  RootedValue rv(cx);
+  bool ok = js::Call(cx, fval, object, calleeval, reasonval, &rv);
+
+  AbstractFramePtr frame;
+  return processHandlerResult(ar, ok, rv, frame, nullptr, vp);
+}
+
 void Debugger::fireNewScript(JSContext* cx,
                              Handle<DebuggerScriptReferent> scriptReferent) {
   RootedObject hook(cx, getHook(OnNewScript));
@@ -3316,6 +3388,13 @@
   return NotObserving;
 }
 
+Debugger::IsObserving Debugger::observesNativeCalls() const {
+  if (getHook(Debugger::OnNativeCall)) {
+    return Observing;
+  }
+  return NotObserving;
+}
+
 // Toggle whether this Debugger's debuggees observe all execution. This is
 // called when a hook that observes all execution is set or unset. See
 // hookObservesAllExecution.
@@ -3567,59 +3646,6 @@
   }
 }
 
-/*
- * Before performing a collection, the GC tries to find whether any collected
- * compartments are expected to die. To do this is needs to know about any cross
- * compartment pointers the debugger has that may keep compartments alive. This
- * is done by calling findCrossCompartmentTargets for compartments it suspects
- * are live.
- */
-
-bool DebugAPI::findCrossCompartmentTargets(JSRuntime* rt,
-                                           JS::Compartment* source,
-                                           CompartmentSet& targets) {
-  for (Debugger* dbg : rt->debuggerList()) {
-    if (dbg->compartment() == source) {
-      if (!dbg->findCrossCompartmentTargets(targets)) {
-        return false;
-      }
-    }
-  }
-
-  return true;
-}
-
-bool Debugger::findCrossCompartmentTargets(CompartmentSet& targets) {
-  for (WeakGlobalObjectSet::Enum e(debuggees); !e.empty(); e.popFront()) {
-    Compartment* comp = e.front().unbarrieredGet()->compartment();
-    if (!targets.put(comp)) {
-      return false;
-    }
-  }
-
-  bool ok = true;
-  forEachWeakMap([&](auto& weakMap) {
-    if (ok && !weakMap.findCrossCompartmentTargets(targets)) {
-      ok = false;
-    }
-  });
-  return ok;
-}
-
-template <class Referent, class Wrapper, bool InvisibleKeysOk>
-bool DebuggerWeakMap<Referent, Wrapper, InvisibleKeysOk>::
-    findCrossCompartmentTargets(CompartmentSet& targets) {
-  for (Enum e(*this); !e.empty(); e.popFront()) {
-    Key key = e.front().key();
-    JS::Compartment* comp = key->compartment();
-    if (!targets.put(comp)) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
 #ifdef DEBUG
 
 static bool RuntimeHasDebugger(JSRuntime* rt, Debugger* dbg) {
@@ -4093,6 +4119,18 @@
 }
 
 /* static */
+bool Debugger::getOnNativeCall(JSContext* cx, unsigned argc, Value* vp) {
+  THIS_DEBUGGER(cx, argc, vp, "(get onNativeCall)", args, dbg);
+  return getHookImpl(cx, args, *dbg, OnNativeCall);
+}
+
+/* static */
+bool Debugger::setOnNativeCall(JSContext* cx, unsigned argc, Value* vp) {
+  THIS_DEBUGGER(cx, argc, vp, "(set onNativeCall)", args, dbg);
+  return setHookImpl(cx, args, *dbg, OnNativeCall);
+}
+
+/* static */
 bool Debugger::getOnNewGlobalObject(JSContext* cx, unsigned argc, Value* vp) {
   THIS_DEBUGGER(cx, argc, vp, "(get onNewGlobalObject)", args, dbg);
   return getHookImpl(cx, args, *dbg, OnNewGlobalObject);
@@ -6094,6 +6132,8 @@
             Debugger::setOnPromiseSettled, 0),
     JS_PSGS("onEnterFrame", Debugger::getOnEnterFrame,
             Debugger::setOnEnterFrame, 0),
+    JS_PSGS("onNativeCall", Debugger::getOnNativeCall,
+            Debugger::setOnNativeCall, 0),
     JS_PSGS("onNewGlobalObject", Debugger::getOnNewGlobalObject,
             Debugger::setOnNewGlobalObject, 0),
     JS_PSGS("uncaughtExceptionHook", Debugger::getUncaughtExceptionHook,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/Debugger.h firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/Debugger.h
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/Debugger.h	2019-09-13 05:13:16.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/Debugger.h	2019-09-15 11:33:12.000000000 +0000
@@ -372,7 +372,6 @@
     }
   }
 
-  bool findCrossCompartmentTargets(CompartmentSet& targets);
   bool findSweepGroupEdges() override;
 
  private:
@@ -464,6 +463,7 @@
     OnExceptionUnwind,
     OnNewScript,
     OnEnterFrame,
+    OnNativeCall,
     OnNewGlobalObject,
     OnNewPromise,
     OnPromiseSettled,
@@ -830,8 +830,6 @@
   void traceForMovingGC(JSTracer* trc);
   void traceCrossCompartmentEdges(JSTracer* tracer);
 
-  bool findCrossCompartmentTargets(CompartmentSet& targets);
-
   static const JSClassOps classOps_;
 
  public:
@@ -854,6 +852,8 @@
   static bool setOnNewScript(JSContext* cx, unsigned argc, Value* vp);
   static bool getOnEnterFrame(JSContext* cx, unsigned argc, Value* vp);
   static bool setOnEnterFrame(JSContext* cx, unsigned argc, Value* vp);
+  static bool getOnNativeCall(JSContext* cx, unsigned argc, Value* vp);
+  static bool setOnNativeCall(JSContext* cx, unsigned argc, Value* vp);
   static bool getOnNewGlobalObject(JSContext* cx, unsigned argc, Value* vp);
   static bool setOnNewGlobalObject(JSContext* cx, unsigned argc, Value* vp);
   static bool getOnNewPromise(JSContext* cx, unsigned argc, Value* vp);
@@ -943,6 +943,9 @@
   // execution.
   IsObserving observesCoverage() const;
 
+  // Whether the Debugger instance needs to observe native call invocations.
+  IsObserving observesNativeCalls() const;
+
  private:
   static MOZ_MUST_USE bool ensureExecutionObservabilityOfFrame(
       JSContext* cx, AbstractFramePtr frame);
@@ -971,6 +974,8 @@
   ResumeMode fireDebuggerStatement(JSContext* cx, MutableHandleValue vp);
   ResumeMode fireExceptionUnwind(JSContext* cx, MutableHandleValue vp);
   ResumeMode fireEnterFrame(JSContext* cx, MutableHandleValue vp);
+  ResumeMode fireNativeCall(JSContext* cx, const CallArgs& args,
+                            CallReason reason, MutableHandleValue vp);
   ResumeMode fireNewGlobalObject(JSContext* cx, Handle<GlobalObject*> global,
                                  MutableHandleValue vp);
   ResumeMode firePromiseHook(JSContext* cx, Hook hook, HandleObject promise,
@@ -1051,7 +1056,6 @@
   static Debugger* fromChildJSObject(JSObject* obj);
 
   Zone* zone() const { return toJSObject()->zone(); }
-  JS::Compartment* compartment() const { return toJSObject()->compartment(); }
 
   bool hasMemory() const;
   DebuggerMemory& memory() const;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/Frame.cpp firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/Frame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/Frame.cpp	2019-09-13 05:13:16.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/Frame.cpp	2019-09-15 11:33:12.000000000 +0000
@@ -913,6 +913,11 @@
     env = newEnv;
   }
 
+  // Note whether we are in an evaluation that might invoke the OnNativeCall
+  // hook, so that the JITs will be disabled.
+  AutoNoteDebuggerEvaluationWithOnNativeCallHook noteEvaluation(
+      cx, dbg->observesNativeCalls() ? dbg : nullptr);
+
   // Run the code and produce the completion value.
   LeaveDebuggeeNoExecute nnx(cx);
   RootedValue rval(cx);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/Object.cpp firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/Object.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/Object.cpp	2019-09-13 05:13:16.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/Object.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -54,6 +54,7 @@
 #include "vm/Runtime.h"                  // for JSAtomState
 #include "vm/SavedFrame.h"               // for SavedFrame
 #include "vm/Scope.h"                    // for PositionalFormalParameterIter
+#include "vm/SelfHosting.h"              // for GetClonedSelfHostedFunctionName
 #include "vm/Shape.h"                    // for Shape
 #include "vm/Stack.h"                    // for InvokeArgs
 #include "vm/StringType.h"               // for JSAtom, PropertyName
@@ -1412,6 +1413,18 @@
 }
 
 /* static */
+bool DebuggerObject::isSameNativeMethod(JSContext* cx, unsigned argc,
+                                        Value* vp) {
+  THIS_DEBUGOBJECT(cx, argc, vp, "isSameNative", args, object);
+  if (!args.requireAtLeast(
+          cx, "Debugger.Object.prototype.isSameNative", 1)) {
+    return false;
+  }
+
+  return DebuggerObject::isSameNative(cx, object, args[0], args.rval());
+}
+
+/* static */
 bool DebuggerObject::unsafeDereferenceMethod(JSContext* cx, unsigned argc,
                                              Value* vp) {
   THIS_DEBUGOBJECT(cx, argc, vp, "unsafeDereference", args, object);
@@ -1605,6 +1618,7 @@
     JS_FN("makeDebuggeeValue", DebuggerObject::makeDebuggeeValueMethod, 1, 0),
     JS_FN("makeDebuggeeNativeFunction",
           DebuggerObject::makeDebuggeeNativeFunctionMethod, 1, 0),
+    JS_FN("isSameNative", DebuggerObject::isSameNativeMethod, 1, 0),
     JS_FN("unsafeDereference", DebuggerObject::unsafeDereferenceMethod, 0, 0),
     JS_FN("unwrap", DebuggerObject::unwrapMethod, 0, 0),
     JS_FN("setInstrumentation", DebuggerObject::setInstrumentationMethod, 2, 0),
@@ -2503,6 +2517,20 @@
   return true;
 }
 
+static JSFunction* EnsureNativeFunction(const Value& value,
+                                        bool allowExtended = true) {
+  if (!value.isObject() || !value.toObject().is<JSFunction>()) {
+    return nullptr;
+  }
+
+  JSFunction* fun = &value.toObject().as<JSFunction>();
+  if (!fun->isNative() || (fun->isExtended() && !allowExtended)) {
+    return nullptr;
+  }
+
+  return fun;
+}
+
 /* static */
 bool DebuggerObject::makeDebuggeeNativeFunction(JSContext* cx,
                                                 HandleDebuggerObject object,
@@ -2511,19 +2539,10 @@
   RootedObject referent(cx, object->referent());
   Debugger* dbg = object->owner();
 
-  if (!value.isObject()) {
-    JS_ReportErrorASCII(cx, "Need object");
-    return false;
-  }
-
-  RootedObject obj(cx, &value.toObject());
-  if (!obj->is<JSFunction>()) {
-    JS_ReportErrorASCII(cx, "Need function");
-    return false;
-  }
-
-  RootedFunction fun(cx, &obj->as<JSFunction>());
-  if (!fun->isNative() || fun->isExtended()) {
+  // The logic below doesn't work with extended functions, so do not allow them.
+  RootedFunction fun(cx, EnsureNativeFunction(value,
+                                              /* allowExtended */ false));
+  if (!fun) {
     JS_ReportErrorASCII(cx, "Need native function");
     return false;
   }
@@ -2553,6 +2572,43 @@
   return true;
 }
 
+static JSAtom* MaybeGetSelfHostedFunctionName(const Value& v) {
+  if (!v.isObject() || !v.toObject().is<JSFunction>()) {
+    return nullptr;
+  }
+
+  JSFunction* fun = &v.toObject().as<JSFunction>();
+  if (!fun->isSelfHostedBuiltin()) {
+    return nullptr;
+  }
+
+  return GetClonedSelfHostedFunctionName(fun);
+}
+
+/* static */
+bool DebuggerObject::isSameNative(JSContext* cx, HandleDebuggerObject object,
+                                  HandleValue value,
+                                  MutableHandleValue result) {
+  RootedValue referentValue(cx, ObjectValue(*object->referent()));
+
+  RootedFunction fun(cx, EnsureNativeFunction(value));
+  if (!fun) {
+    RootedAtom selfHostedName(cx, MaybeGetSelfHostedFunctionName(value));
+    if (!selfHostedName) {
+      JS_ReportErrorASCII(cx, "Need native function");
+      return false;
+    }
+
+    result.setBoolean(
+        selfHostedName == MaybeGetSelfHostedFunctionName(referentValue));
+    return true;
+  }
+
+  RootedFunction referentFun(cx, EnsureNativeFunction(referentValue));
+  result.setBoolean(referentFun && referentFun->native() == fun->native());
+  return true;
+}
+
 /* static */
 bool DebuggerObject::unsafeDereference(JSContext* cx,
                                        HandleDebuggerObject object,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/Object.h firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/Object.h
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/debugger/Object.h	2019-09-13 05:13:16.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/debugger/Object.h	2019-09-15 11:33:12.000000000 +0000
@@ -146,6 +146,10 @@
   static MOZ_MUST_USE bool makeDebuggeeNativeFunction(
       JSContext* cx, HandleDebuggerObject object, HandleValue value,
       MutableHandleValue result);
+  static MOZ_MUST_USE bool isSameNative(JSContext* cx,
+                                        HandleDebuggerObject object,
+                                        HandleValue value,
+                                        MutableHandleValue result);
   static MOZ_MUST_USE bool unsafeDereference(JSContext* cx,
                                              HandleDebuggerObject object,
                                              MutableHandleObject result);
@@ -313,6 +317,8 @@
   static MOZ_MUST_USE bool makeDebuggeeNativeFunctionMethod(JSContext* cx,
                                                             unsigned argc,
                                                             Value* vp);
+  static MOZ_MUST_USE bool isSameNativeMethod(JSContext* cx, unsigned argc,
+                                              Value* vp);
   static MOZ_MUST_USE bool unsafeDereferenceMethod(JSContext* cx, unsigned argc,
                                                    Value* vp);
   static MOZ_MUST_USE bool unwrapMethod(JSContext* cx, unsigned argc,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/doc/Debugger/Debugger.md firefox-trunk-71.0~a1~hg20190915r493291/js/src/doc/Debugger/Debugger.md
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/doc/Debugger/Debugger.md	2019-09-13 05:13:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/doc/Debugger/Debugger.md	2019-09-15 11:33:12.000000000 +0000
@@ -162,6 +162,24 @@
     SpiderMonkey only calls `onEnterFrame` to report
     [visible][vf], non-`"debugger"` frames.
 
+<code>onNativeCall(<i>callee</i>, <i>reason</i>)</code>
+:   A call to a native function is being made from a debuggee realm.
+    <i>callee</i> is a [`Debugger.Object`] for the function being called, and
+    <i>reason</i> is a string describing the reason the call was made, and
+    has one of the following values:
+
+    `get`: The native is the getter for a property which is being accessed.
+    `set`: The native is the setter for a property being written to.
+    `call`: Any call not fitting into the above categories.
+
+    This method should return a [resumption value][rv] specifying how the
+    debuggee's execution should proceed.
+
+    SpiderMonkey only calls `onNativeCall` hooks when execution is inside a
+    debugger evaluation associated with the debugger that has the `onNativeCall`
+    hook.  Such evaluation methods include `Debugger.Object.executeInGlobal`,
+    `Debugger.Frame.eval`, and associated methods.
+
 <code>onExceptionUnwind(<i>frame</i>, <i>value</i>)</code>
 :   The exception <i>value</i> has been thrown, and has propagated to
     <i>frame</i>; <i>frame</i> is the youngest remaining stack frame, and is a
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/doc/Debugger/Debugger.Object.md firefox-trunk-71.0~a1~hg20190915r493291/js/src/doc/Debugger/Debugger.Object.md
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/doc/Debugger/Debugger.Object.md	2019-09-13 05:13:16.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/doc/Debugger/Debugger.Object.md	2019-09-15 11:33:12.000000000 +0000
@@ -460,6 +460,10 @@
     can be accessed by code in the debuggee without going through a cross
     compartment wrapper.
 
+<code>isSameNative(<i>value</i>)</code>
+:   If <i>value</i> is a native function in the debugger's compartment, return
+    whether the referent is a native function for the same C++ native.
+
 <code>decompile([<i>pretty</i>])</code>
 :   If the referent is a function that is debuggee code, return the
     JavaScript source code for a function definition equivalent to the
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/frontend/BinASTTokenReaderContext.cpp firefox-trunk-71.0~a1~hg20190915r493291/js/src/frontend/BinASTTokenReaderContext.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/frontend/BinASTTokenReaderContext.cpp	2019-09-13 05:13:16.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/frontend/BinASTTokenReaderContext.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -6,8 +6,9 @@
 
 #include "frontend/BinASTTokenReaderContext.h"
 
-#include "mozilla/Result.h"     // MOZ_TRY*
-#include "mozilla/ScopeExit.h"  // mozilla::MakeScopeExit
+#include "mozilla/IntegerTypeTraits.h"  // mozilla::MaxValue
+#include "mozilla/Result.h"             // MOZ_TRY*
+#include "mozilla/ScopeExit.h"          // mozilla::MakeScopeExit
 
 #include <string.h>  // memchr, memcmp, memmove
 
@@ -43,12 +44,30 @@
 // Hardcoded in the format.
 const uint8_t MAX_CODE_BIT_LENGTH = 20;
 
+// The maximal number of bits needed to represent bit lengths.
+const uint8_t MAX_BIT_LENGTH_BIT_LENGTH = 5;
+static_assert(1 << (MAX_BIT_LENGTH_BIT_LENGTH - 1) < MAX_CODE_BIT_LENGTH,
+              "MAX_BIT_LENGTH_BIT_LENGTH - 1 bits MUST be insufficient to "
+              "store MAX_CODE_BIT_LENGTH");
+static_assert(
+    1 << MAX_BIT_LENGTH_BIT_LENGTH >= MAX_CODE_BIT_LENGTH,
+    "MAX_BIT_LENGTH bits MUST be sufficient to store MAX_CODE_BIT_LENGTH");
+
 // The maximal length of a Huffman prefix.
 //
 // This is distinct from MAX_CODE_BIT_LENGTH as we commonly load
 // more bites than necessary, just to be on the safe side.
 const uint8_t MAX_PREFIX_BIT_LENGTH = 32;
 
+// Maximal bit length acceptable in a `HuffmanTableSaturated`.
+//
+// As `HuffmanTableSaturated` require O(2 ^ max bit len) space, we
+// cannot afford to use them for all tables. Whenever the max bit
+// length in the table is <= MAX_BIT_LENGTH_IN_SATURATED_TABLE,
+// we use a `HuffmanTableSaturated`. Otherwise, we fall back to
+// a slower but less memory-hungry solution.
+const uint8_t MAX_BIT_LENGTH_IN_SATURATED_TABLE = 10;
+
 // The length of the bit buffer, in bits.
 const uint8_t BIT_BUFFER_SIZE = 64;
 
@@ -567,7 +586,10 @@
       BINJS_MOZ_TRY_DECL(
           symbol, readSymbol<Entry>(entry, /* First and only value */ 0));
 
-      MOZ_TRY(table.impl.initWithSingleValue(cx_, std::move(symbol)));
+      MOZ_TRY(table.initWithSingleValue(cx_, std::move(symbol)));
+#ifdef DEBUG
+      table.selfCheck();
+#endif  // DEBUG
       return Ok();
     }
 
@@ -596,12 +618,17 @@
         auxStorageLength.empty());  // We must have cleaned it up properly.
     BINJS_TRY(auxStorageLength.reserve(numberOfSymbols + 1));
 
+    uint8_t maxBitLength = 0;
+
     // First read and store the bit lengths for all symbols.
     for (size_t i = 0; i < numberOfSymbols; ++i) {
       BINJS_MOZ_TRY_DECL(bitLength, reader.readByte<Compression::No>());
       if (bitLength == 0) {
         return raiseInvalidTableData(entry.identity);
       }
+      if (bitLength > maxBitLength) {
+        maxBitLength = bitLength;
+      }
       BINJS_TRY(auxStorageLength.append(BitLengthAndIndex(bitLength, i)));
     }
     // Append a terminator.
@@ -610,7 +637,7 @@
 
     // Now read the symbols and assign bits.
     uint32_t code = 0;
-    MOZ_TRY(table.impl.init(cx_, numberOfSymbols));
+    MOZ_TRY(table.init(cx_, numberOfSymbols, maxBitLength));
 
     for (size_t i = 0; i < numberOfSymbols; ++i) {
       const auto bitLength = auxStorageLength[i].bitLength;
@@ -627,12 +654,15 @@
       // Read and add symbol.
       BINJS_MOZ_TRY_DECL(
           symbol, readSymbol<Entry>(entry, i));  // Symbol is read from disk.
-      MOZ_TRY(table.impl.addSymbol(code, bitLength, std::move(symbol)));
+      MOZ_TRY(table.addSymbol(code, bitLength, std::move(symbol)));
 
       // Prepare next code.
       code = (code + 1) << (nextBitLength - bitLength);
     }
 
+#ifdef DEBUG
+    table.selfCheck();
+#endif  // DEBUG
     auxStorageLength.clear();
     return Ok();
   }
@@ -653,16 +683,21 @@
     // - Lengths MAY be 0.
     // - Lengths are not sorted on disk.
 
+    uint8_t maxBitLength = 0;
+
     // First read the length for all symbols, only store non-0 lengths.
     for (size_t i = 0; i < numberOfSymbols; ++i) {
       BINJS_MOZ_TRY_DECL(bitLength, reader.readByte<Compression::No>());
+      if (bitLength > MAX_CODE_BIT_LENGTH) {
+        MOZ_CRASH("FIXME: Implement error");
+      }
       if (bitLength > 0) {
         BINJS_TRY(auxStorageLength.append(BitLengthAndIndex(bitLength, i)));
+        if (bitLength > maxBitLength) {
+          maxBitLength = bitLength;
+        }
       }
     }
-    // Append a terminator.
-    BINJS_TRY(auxStorageLength.append(
-        BitLengthAndIndex(MAX_CODE_BIT_LENGTH, numberOfSymbols)));
 
     // Sort by length then webidl order (which is also the index).
     std::sort(auxStorageLength.begin(), auxStorageLength.end(),
@@ -679,13 +714,14 @@
                 // In case of equal bit length, compare by symbol value.
                 return entry.lessThan(a.index, b.index);
               });
-    MOZ_ASSERT(
-        auxStorageLength[auxStorageLength.length() - 1].bitLength ==
-        MAX_CODE_BIT_LENGTH);  // Guaranteed to exist as we have a terminator.
+
+    // Append a terminator.
+    BINJS_TRY(
+        auxStorageLength.emplaceBack(MAX_CODE_BIT_LENGTH, numberOfSymbols));
 
     // Now read the symbols and assign bits.
     uint32_t code = 0;
-    MOZ_TRY(table.impl.init(cx_, auxStorageLength.length() - 1));
+    MOZ_TRY(table.init(cx_, auxStorageLength.length() - 1, maxBitLength));
 
     for (size_t i = 0; i < auxStorageLength.length() - 1; ++i) {
       const auto bitLength = auxStorageLength[i].bitLength;
@@ -702,12 +738,16 @@
               entry,
               auxStorageLength[i].index));  // Symbol is read from memory.
 
-      MOZ_TRY(table.impl.addSymbol(code, bitLength, std::move(symbol)));
+      MOZ_TRY(table.addSymbol(code, bitLength, std::move(symbol)));
 
       // Prepare next code.
       code = (code + 1) << (nextBitLength - bitLength);
     }
 
+#ifdef DEBUG
+    table.selfCheck();
+#endif  // DEBUG
+
     auxStorageLength.clear();
     return Ok();
   }
@@ -717,7 +757,7 @@
   template <typename Entry>
   MOZ_MUST_USE JS::Result<Ok> readTable(Entry entry) {
     auto& table = dictionary.tableForField(entry.identity);
-    return readTable<HuffmanTable, Entry>(table, entry);
+    return readTable<HuffmanTableValue, Entry>(table, entry);
   }
 
   // Two-arguments version: pass table explicitly. Generally called from single-
@@ -818,12 +858,14 @@
       //   a. Determine if the array type is always empty
       //   b. If so, stop
       auto& lengthTable = table.as<HuffmanTableExplicitSymbolsListLength>();
-      uint32_t length = 0;
-      for (const auto& iter : lengthTable.impl) {
-        length += iter.value;
+      bool empty = true;
+      for (auto iter : lengthTable) {
+        if (*iter > 0) {
+          empty = false;
+          break;
+        }
       }
-
-      if (length == 0) {
+      if (empty) {
         return Ok();
       }
 
@@ -857,7 +899,11 @@
       if (table.is<HuffmanTableUnreachable>()) {
         // Effectively, an `Interface` is a sum with a single entry.
         HuffmanTableIndexedSymbolsSum sum(cx_);
-        MOZ_TRY(sum.impl.initWithSingleValue(cx_, BinASTKind(interface.kind)));
+        MOZ_TRY(sum.initWithSingleValue(cx_, BinASTKind(interface.kind)));
+
+#ifdef DEBUG
+        sum.selfCheck();
+#endif  // DEBUG
 
         table = {mozilla::VariantType<HuffmanTableIndexedSymbolsSum>{},
                  std::move(sum)};
@@ -957,10 +1003,10 @@
       }
       const auto& tableRef = table.as<HuffmanTableIndexedSymbolsSum>();
 
-      for (const auto& kind : tableRef.impl) {
+      for (auto iter : tableRef) {
         MOZ_TRY(owner.pushValue(
             entry.identity,
-            {mozilla::VariantType<Interface>(), entry.identity, kind.value}));
+            {mozilla::VariantType<Interface>(), entry.identity, *iter}));
       }
       return Ok();
     }
@@ -982,10 +1028,10 @@
       }
       const auto& tableRef = table.as<HuffmanTableIndexedSymbolsSum>();
 
-      for (const auto& kind : tableRef.impl) {
+      for (auto iter : tableRef) {
         MOZ_TRY(owner.pushValue(
             entry.identity,
-            {mozilla::VariantType<Interface>(), entry.identity, kind.value}));
+            {mozilla::VariantType<Interface>(), entry.identity, *iter}));
       }
       return Ok();
     }
@@ -1343,7 +1389,7 @@
   JS::Result<BinASTKind> operator()(
       const HuffmanTableIndexedSymbolsSum& specialized) {
     // We're entering either a single interface or a sum.
-    const auto lookup = specialized.impl.lookup(bits);
+    const auto lookup = specialized.lookup(bits);
     bitBuffer.advanceBitBuffer<Compression::No>(lookup.key.bitLength);
     if (!lookup.value) {
       return owner.raiseInvalidValue(context);
@@ -1353,7 +1399,7 @@
   JS::Result<BinASTKind> operator()(
       const HuffmanTableIndexedSymbolsMaybeInterface& specialized) {
     // We're entering an optional interface.
-    const auto lookup = specialized.impl.lookup(bits);
+    const auto lookup = specialized.lookup(bits);
     bitBuffer.advanceBitBuffer<Compression::No>(lookup.key.bitLength);
     if (!lookup.value) {
       return owner.raiseInvalidValue(context);
@@ -1390,7 +1436,7 @@
     return raiseNotInPrelude(context);
   }
   BINJS_MOZ_TRY_DECL(bits, bitBuffer.getHuffmanLookup<Compression::No>(*this));
-  const auto lookup = table.as<Table>().impl.lookup(bits);
+  const auto lookup = table.as<Table>().lookup(bits);
 
   bitBuffer.advanceBitBuffer<Compression::No>(lookup.key.bitLength);
   if (!lookup.value) {
@@ -1488,7 +1534,7 @@
   BINJS_MOZ_TRY_DECL(bits, bitBuffer.getHuffmanLookup<Compression::No>(*this));
   const auto& tableForLookup =
       table.as<HuffmanTableExplicitSymbolsListLength>();
-  const auto lookup = tableForLookup.impl.lookup(bits);
+  const auto lookup = tableForLookup.lookup(bits);
   bitBuffer.advanceBitBuffer<Compression::No>(lookup.key.bitLength);
   if (!lookup.value) {
     return raiseInvalidValue(context);
@@ -1571,9 +1617,236 @@
   return Ok();
 }
 
+HuffmanKey::HuffmanKey(const uint32_t bits, const uint8_t bitLength)
+    : bits(bits), bitLength(bitLength) {
+  MOZ_ASSERT(bitLength <= MAX_PREFIX_BIT_LENGTH);
+  MOZ_ASSERT_IF(bitLength != 32 /* >> 32 is UB */, bits >> bitLength == 0);
+}
+
+FlatHuffmanKey::FlatHuffmanKey(HuffmanKey key)
+    : representation((key.bitLength << MAX_CODE_BIT_LENGTH) | key.bits) {
+  static_assert(MAX_CODE_BIT_LENGTH + MAX_BIT_LENGTH_BIT_LENGTH <= 32,
+                "32 bits MUST be sufficient to store bits and bitLength");
+  MOZ_ASSERT(key.bits >> MAX_CODE_BIT_LENGTH == 0);
+  MOZ_ASSERT(key.bitLength >> MAX_BIT_LENGTH_BIT_LENGTH == 0);
+}
+
+FlatHuffmanKey::FlatHuffmanKey(const HuffmanKey* key)
+    : representation((key->bitLength << MAX_CODE_BIT_LENGTH) | key->bits) {
+  static_assert(MAX_CODE_BIT_LENGTH + MAX_BIT_LENGTH_BIT_LENGTH <= 32,
+                "32 bits MUST be sufficient to store bits and bitLength");
+  MOZ_ASSERT(key->bits >> MAX_CODE_BIT_LENGTH == 0);
+  MOZ_ASSERT(key->bitLength >> MAX_BIT_LENGTH_BIT_LENGTH == 0);
+}
+
+// ---- Implementation of Huffman Tables
+
+template <typename T>
+HuffmanTableImplementationGeneric<T>::Iterator::Iterator(
+    typename HuffmanTableImplementationSaturated<T>::Iterator&& iterator)
+    : implementation(std::move(iterator)) {}
+
+template <typename T>
+HuffmanTableImplementationGeneric<T>::Iterator::Iterator(
+    typename HuffmanTableImplementationMap<T>::Iterator&& iterator)
+    : implementation(std::move(iterator)) {}
+
+template <typename T>
+void HuffmanTableImplementationGeneric<T>::Iterator::operator++() {
+  implementation.match(
+      [](typename HuffmanTableImplementationSaturated<T>::Iterator& iterator) {
+        iterator.operator++();
+      },
+      [](typename HuffmanTableImplementationMap<T>::Iterator& iterator) {
+        iterator.operator++();
+      });
+}
+
+template <typename T>
+bool HuffmanTableImplementationGeneric<T>::Iterator::operator==(
+    const HuffmanTableImplementationGeneric<T>::Iterator& other) const {
+  return implementation.match(
+      [other](const typename HuffmanTableImplementationSaturated<T>::Iterator&
+                  iterator) {
+        return iterator ==
+               other.implementation.template as<
+                   typename HuffmanTableImplementationSaturated<T>::Iterator>();
+      },
+      [other](
+          const typename HuffmanTableImplementationMap<T>::Iterator& iterator) {
+        return iterator ==
+               other.implementation.template as<
+                   typename HuffmanTableImplementationMap<T>::Iterator>();
+      });
+}
+
+template <typename T>
+bool HuffmanTableImplementationGeneric<T>::Iterator::operator!=(
+    const HuffmanTableImplementationGeneric<T>::Iterator& other) const {
+  return implementation.match(
+      [other](const typename HuffmanTableImplementationSaturated<T>::Iterator&
+                  iterator) {
+        return iterator !=
+               other.implementation.template as<
+                   typename HuffmanTableImplementationSaturated<T>::Iterator>();
+      },
+      [other](
+          const typename HuffmanTableImplementationMap<T>::Iterator& iterator) {
+        return iterator !=
+               other.implementation.template as<
+                   typename HuffmanTableImplementationMap<T>::Iterator>();
+      });
+}
+
+template <typename T>
+const T* HuffmanTableImplementationGeneric<T>::Iterator::operator*() const {
+  return implementation.match(
+      [](const typename HuffmanTableImplementationSaturated<T>::Iterator&
+             iterator) { return iterator.operator*(); },
+      [](const typename HuffmanTableImplementationMap<T>::Iterator& iterator) {
+        return iterator.operator*();
+      });
+}
+
+template <typename T>
+HuffmanTableImplementationGeneric<T>::HuffmanTableImplementationGeneric(
+    JSContext*)
+    : implementation(HuffmanTableUnreachable{}) {}
+
+#ifdef DEBUG
+template <typename T>
+void HuffmanTableImplementationGeneric<T>::selfCheck() {
+  this->implementation.match(
+      [](HuffmanTableImplementationSaturated<T>& implementation) {
+        implementation.selfCheck();
+      },
+      [](HuffmanTableImplementationMap<T>& implementation) {
+        implementation.selfCheck();
+      },
+      [](HuffmanTableUnreachable&) {
+        MOZ_CRASH("HuffmanTableImplementationGeneric is unitialized!");
+      });
+}
+#endif  // DEBUG
+
+template <typename T>
+typename HuffmanTableImplementationGeneric<T>::Iterator
+HuffmanTableImplementationGeneric<T>::begin() const {
+  return this->implementation.match(
+      [](const HuffmanTableImplementationSaturated<T>& implementation)
+          -> HuffmanTableImplementationGeneric<T>::Iterator {
+        return Iterator(implementation.begin());
+      },
+      [](const HuffmanTableImplementationMap<T>& implementation)
+          -> HuffmanTableImplementationGeneric<T>::Iterator {
+        return Iterator(implementation.begin());
+      },
+      [](const HuffmanTableUnreachable&)
+          -> HuffmanTableImplementationGeneric<T>::Iterator {
+        MOZ_CRASH("HuffmanTableImplementationGeneric is unitialized!");
+      });
+}
+
+template <typename T>
+typename HuffmanTableImplementationGeneric<T>::Iterator
+HuffmanTableImplementationGeneric<T>::end() const {
+  return this->implementation.match(
+      [](const HuffmanTableImplementationSaturated<T>& implementation)
+          -> HuffmanTableImplementationGeneric<T>::Iterator {
+        return Iterator(implementation.end());
+      },
+      [](const HuffmanTableImplementationMap<T>& implementation)
+          -> HuffmanTableImplementationGeneric<T>::Iterator {
+        return Iterator(implementation.end());
+      },
+      [](const HuffmanTableUnreachable&)
+          -> HuffmanTableImplementationGeneric<T>::Iterator {
+        MOZ_CRASH("HuffmanTableImplementationGeneric is unitialized!");
+      });
+}
+
+template <typename T>
+JS::Result<Ok> HuffmanTableImplementationGeneric<T>::initWithSingleValue(
+    JSContext* cx, T&& value) {
+  // Only one value: use HuffmanImplementationSaturated
+  MOZ_ASSERT(this->implementation.template is<
+             HuffmanTableUnreachable>());  // Make sure that we're initializing.
+
+  this->implementation = {
+      mozilla::VariantType<HuffmanTableImplementationSaturated<T>>{}, cx};
+
+  MOZ_TRY(
+      this->implementation.template as<HuffmanTableImplementationSaturated<T>>()
+          .initWithSingleValue(cx, std::move(value)));
+  return Ok();
+}
+
+template <typename T>
+JS::Result<Ok> HuffmanTableImplementationGeneric<T>::init(
+    JSContext* cx, size_t numberOfSymbols, uint8_t maxBitLength) {
+  MOZ_ASSERT(this->implementation.template is<
+             HuffmanTableUnreachable>());  // Make sure that we're initializing.
+  if (
+      // If the bit length is too large, don't put it in a saturated table
+      // as this would need too much space.
+      maxBitLength > MAX_BIT_LENGTH_IN_SATURATED_TABLE ||
+      // If there are too many symbols, don't put it in a saturated table
+      // as indices  wouldn't fit into `InternalIndex` .
+      numberOfSymbols >
+          mozilla::MaxValue<typename HuffmanTableImplementationSaturated<
+              T>::InternalIndex>::value) {
+    this->implementation = {
+        mozilla::VariantType<HuffmanTableImplementationMap<T>>{}, cx};
+    MOZ_TRY(this->implementation.template as<HuffmanTableImplementationMap<T>>()
+                .init(cx, numberOfSymbols, maxBitLength));
+  } else {
+    this->implementation = {
+        mozilla::VariantType<HuffmanTableImplementationSaturated<T>>{}, cx};
+    MOZ_TRY(this->implementation
+                .template as<HuffmanTableImplementationSaturated<T>>()
+                .init(cx, numberOfSymbols, maxBitLength));
+  }
+  return Ok();
+}
+
+template <typename T>
+JS::Result<Ok> HuffmanTableImplementationGeneric<T>::addSymbol(
+    uint32_t bits, uint8_t bitLength, T&& value) {
+  return this->implementation.match(
+      [bits, bitLength, value = std::move(value)](
+          HuffmanTableImplementationSaturated<T>&
+              implementation) mutable /* discard implicit const */
+      -> JS::Result<Ok> {
+        return implementation.addSymbol(bits, bitLength, std::move(value));
+      },
+      [bits, bitLength, value = std::move(value)](
+          HuffmanTableImplementationMap<T>&
+              implementation) mutable /* discard implicit const */
+      -> JS::Result<Ok> {
+        return implementation.addSymbol(bits, bitLength, std::move(value));
+      },
+      [](HuffmanTableUnreachable&) -> JS::Result<Ok> {
+        MOZ_CRASH("HuffmanTableImplementationGeneric is unitialized!");
+        return Ok();
+      });
+}
+
+template <typename T>
+HuffmanEntry<const T*> HuffmanTableImplementationGeneric<T>::lookup(
+    HuffmanLookup lookup) const {
+  return this->implementation.match(
+      [lookup](const HuffmanTableImplementationSaturated<T>& implementation)
+          -> HuffmanEntry<const T*> { return implementation.lookup(lookup); },
+      [lookup](const HuffmanTableImplementationMap<T>& implementation)
+          -> HuffmanEntry<const T*> { return implementation.lookup(lookup); },
+      [](const HuffmanTableUnreachable&) -> HuffmanEntry<const T*> {
+        MOZ_CRASH("HuffmanTableImplementationGeneric is unitialized!");
+      });
+}
+
 template <typename T, int N>
-JS::Result<Ok> HuffmanTableImpl<T, N>::initWithSingleValue(JSContext* cx,
-                                                           T&& value) {
+JS::Result<Ok> HuffmanTableImplementationNaive<T, N>::initWithSingleValue(
+    JSContext* cx, T&& value) {
   MOZ_ASSERT(values.empty());  // Make sure that we're initializing.
   if (!values.append(HuffmanEntry<T>(0, 0, std::move(value)))) {
     return cx->alreadyReportedError();
@@ -1582,8 +1855,8 @@
 }
 
 template <typename T, int N>
-JS::Result<Ok> HuffmanTableImpl<T, N>::init(JSContext* cx,
-                                            size_t numberOfSymbols) {
+JS::Result<Ok> HuffmanTableImplementationNaive<T, N>::init(
+    JSContext* cx, size_t numberOfSymbols, uint8_t) {
   MOZ_ASSERT(values.empty());  // Make sure that we're initializing.
   if (!values.initCapacity(numberOfSymbols)) {
     return cx->alreadyReportedError();
@@ -1591,9 +1864,16 @@
   return Ok();
 }
 
+#ifdef DEBUG
+template <typename T, int N>
+void HuffmanTableImplementationNaive<T, N>::selfCheck() {
+  // Nothing to check
+}
+#endif  // DEBUG
+
 template <typename T, int N>
-JS::Result<Ok> HuffmanTableImpl<T, N>::addSymbol(uint32_t bits,
-                                                 uint8_t bitLength, T&& value) {
+JS::Result<Ok> HuffmanTableImplementationNaive<T, N>::addSymbol(
+    uint32_t bits, uint8_t bitLength, T&& value) {
   MOZ_ASSERT(bitLength != 0,
              "Adding a symbol with a bitLength of 0 doesn't make sense.");
   MOZ_ASSERT(values.empty() || values.back().key.bitLength <= bitLength,
@@ -1607,7 +1887,8 @@
 }
 
 template <typename T, int N>
-HuffmanEntry<const T*> HuffmanTableImpl<T, N>::lookup(HuffmanLookup key) const {
+HuffmanEntry<const T*> HuffmanTableImplementationNaive<T, N>::lookup(
+    HuffmanLookup key) const {
   // This current implementation is O(length) and designed mostly for testing.
   // Future versions will presumably adapt the underlying data structure to
   // provide bounded-time lookup.
@@ -1625,9 +1906,233 @@
     }
   }
 
+  // Error: no entry found.
+  return HuffmanEntry<const T*>(0, 0, nullptr);
+}
+
+template <typename T>
+JS::Result<Ok> HuffmanTableImplementationMap<T>::initWithSingleValue(
+    JSContext* cx, T&& value) {
+  MOZ_ASSERT(values.empty());  // Make sure that we're initializing.
+  const HuffmanKey key(0, 0);
+  if (!values.put(FlatHuffmanKey(key), std::move(value)) || !keys.append(key)) {
+    ReportOutOfMemory(cx);
+    return cx->alreadyReportedError();
+  }
+  return Ok();
+}
+
+template <typename T>
+JS::Result<Ok> HuffmanTableImplementationMap<T>::init(JSContext* cx,
+                                                      size_t numberOfSymbols,
+                                                      uint8_t) {
+  MOZ_ASSERT(values.empty());  // Make sure that we're initializing.
+  if (!values.reserve(numberOfSymbols) || !keys.reserve(numberOfSymbols)) {
+    ReportOutOfMemory(cx);
+    return cx->alreadyReportedError();
+  }
+  return Ok();
+}
+
+#ifdef DEBUG
+template <typename T>
+void HuffmanTableImplementationMap<T>::selfCheck() {
+  // Check that there is a bijection between `keys` and `values`.
+  // 1. Injection.
+  for (const auto& key : keys) {
+    if (!values.has(FlatHuffmanKey(key))) {
+      MOZ_CRASH();
+    }
+  }
+  // 2. Cardinality.
+  MOZ_ASSERT(values.count() == keys.length());
+}
+#endif  // DEBUG
+
+template <typename T>
+JS::Result<Ok> HuffmanTableImplementationMap<T>::addSymbol(uint32_t bits,
+                                                           uint8_t bitLength,
+                                                           T&& value) {
+  MOZ_ASSERT(bitLength != 0,
+             "Adding a symbol with a bitLength of 0 doesn't make sense.");
+  MOZ_ASSERT_IF(bitLength != 32 /* >> 32 is UB */, bits >> bitLength == 0);
+  const HuffmanKey key(bits, bitLength);
+  const FlatHuffmanKey flat(key);
+  values.putNewInfallible(
+      flat, std::move(value));  // Memory was reserved in `init()`.
+  keys.infallibleAppend(std::move(key));
+
+  return Ok();
+}
+
+template <typename T>
+HuffmanEntry<const T*> HuffmanTableImplementationMap<T>::lookup(
+    HuffmanLookup lookup) const {
+  for (auto bitLength = 0; bitLength < MAX_CODE_BIT_LENGTH; ++bitLength) {
+    const uint32_t bits = lookup.leadingBits(bitLength);
+    const HuffmanKey key(bits, bitLength);
+    const FlatHuffmanKey flat(key);
+    if (auto ptr = values.lookup(flat)) {
+      // Entry found.
+      return HuffmanEntry<const T*>(bits, bitLength, &ptr->value());
+    }
+  }
+
+  // Error: no entry found.
   return HuffmanEntry<const T*>(0, 0, nullptr);
 }
 
+template <typename T>
+HuffmanTableImplementationSaturated<T>::Iterator::Iterator(
+    const HuffmanEntry<T>* position)
+    : position(position) {}
+
+template <typename T>
+void HuffmanTableImplementationSaturated<T>::Iterator::operator++() {
+  position++;
+}
+
+template <typename T>
+const T* HuffmanTableImplementationSaturated<T>::Iterator::operator*() const {
+  return &position->value;
+}
+
+template <typename T>
+bool HuffmanTableImplementationSaturated<T>::Iterator::operator==(
+    const Iterator& other) const {
+  return position == other.position;
+}
+
+template <typename T>
+bool HuffmanTableImplementationSaturated<T>::Iterator::operator!=(
+    const Iterator& other) const {
+  return position != other.position;
+}
+
+template <typename T>
+JS::Result<Ok> HuffmanTableImplementationSaturated<T>::initWithSingleValue(
+    JSContext* cx, T&& value) {
+  MOZ_ASSERT(values.empty());  // Make sure that we're initializing.
+  if (!values.emplaceBack(0, 0, std::move(value))) {
+    return cx->alreadyReportedError();
+  }
+  if (!saturated.emplaceBack(0)) {
+    return cx->alreadyReportedError();
+  }
+  this->maxBitLength = 0;
+  return Ok();
+}
+
+template <typename T>
+JS::Result<Ok> HuffmanTableImplementationSaturated<T>::init(
+    JSContext* cx, size_t numberOfSymbols, uint8_t maxBitLength) {
+  MOZ_ASSERT(maxBitLength <= MAX_BIT_LENGTH_IN_SATURATED_TABLE);
+  MOZ_ASSERT(values.empty());  // Make sure that we're initializing.
+
+  this->maxBitLength = maxBitLength;
+
+  if (!values.initCapacity(numberOfSymbols)) {
+    return cx->alreadyReportedError();
+  }
+  const size_t saturatedLength = 1 << maxBitLength;
+  if (!saturated.initCapacity(saturatedLength)) {
+    return cx->alreadyReportedError();
+  }
+  // Enlarge `saturated`, as we're going to fill it in random order.
+  for (size_t i = 0; i < saturatedLength; ++i) {
+    // Capacity reserved in this method.
+    saturated.infallibleAppend(uint8_t(-1));
+  }
+  return Ok();
+}
+
+#ifdef DEBUG
+template <typename T>
+void HuffmanTableImplementationSaturated<T>::selfCheck() {
+  // Double-check that we've initialized properly.
+  MOZ_ASSERT(this->maxBitLength <= MAX_CODE_BIT_LENGTH);
+
+  bool foundMaxBitLength = false;
+  for (size_t i = 0; i < saturated.length(); ++i) {
+    // Check that all indices have been properly initialized.
+    // Note: this is an explicit `for(;;)` loop instead of
+    // a `for(:)` range loop, as knowing `i` should simplify
+    // debugging.
+    const uint8_t index = saturated[i];
+    MOZ_ASSERT(index < values.length());
+    if (values[index].key.bitLength == maxBitLength) {
+      foundMaxBitLength = true;
+    }
+  }
+  MOZ_ASSERT(foundMaxBitLength);
+}
+#endif  // DEBUG
+
+template <typename T>
+JS::Result<Ok> HuffmanTableImplementationSaturated<T>::addSymbol(
+    uint32_t bits, uint8_t bitLength, T&& value) {
+  MOZ_ASSERT(bitLength != 0,
+             "Adding a symbol with a bitLength of 0 doesn't make sense.");
+  MOZ_ASSERT(values.empty() || values.back().key.bitLength <= bitLength,
+             "Symbols must be ranked by increasing bits length");
+  MOZ_ASSERT_IF(bitLength != 32 /* >> 32 is UB */, bits >> bitLength == 0);
+  MOZ_ASSERT(bitLength <= maxBitLength);
+
+  const size_t index = values.length();
+
+  // First add the value to `values`.
+  if (!values.emplaceBack(bits, bitLength, std::move(value))) {
+    // Memory was reserved in `init()`.
+    MOZ_CRASH();
+  }
+
+  // Notation: in the following, unless otherwise specified, we consider
+  // values with `maxBitLength` bits exactly.
+  //
+  // When we perform lookup, we will extract `maxBitLength` bits from the key
+  // into a value `0bB...B`. We have a match for `value` if and only if
+  // `0bB...B` may be decomposed into `0bC...CX...X` such that
+  //    - `0bC...C` is `bitLength` bits long;
+  //    - `0bC...C == bits`.
+  //
+  // To perform a fast lookup, we precompute all possible values of `0bB...B`
+  // for which this condition is true. That's all the values of segment
+  // `[0bC...C0...0, 0bC...C1...1]`.
+  const uint8_t padding = maxBitLength - bitLength;
+
+  // `begin` holds `0bC...C0...0` above
+  const size_t begin = bits << padding;
+
+  // `length holds `0bC...C1...1` - `0bC...C0...0`
+  const size_t length =
+      ((padding != 0) ? size_t(-1) >> (8 * sizeof(size_t) - padding) : 0) + 1;
+  for (size_t i = begin; i < begin + length; ++i) {
+    saturated[i] = index;
+  }
+
+  return Ok();
+}
+
+template <typename T>
+HuffmanEntry<const T*> HuffmanTableImplementationSaturated<T>::lookup(
+    HuffmanLookup key) const {
+  // Take the `maxBitLength` highest weight bits of `key`.
+  // In the documentation of `addSymbol`, this is
+  // `0bB...B`.
+  const uint32_t bits = key.leadingBits(maxBitLength);
+
+  // Invariants: `saturated.length() == 1 << maxBitLength`
+  // and `bits <= 1 << maxBitLength`.
+  const size_t index = saturated[bits];
+
+  // Invariants: `saturated[i] < values.length()`.
+  const auto& entry = values[index];
+  return HuffmanEntry<const T*>(entry.key.bits, entry.key.bitLength,
+                                &entry.value);
+}
+
+// -----
+
 // The number of possible interfaces in each sum, indexed by
 // `static_cast<size_t>(BinASTSum)`.
 const size_t SUM_LIMITS[]{
@@ -1736,7 +2241,10 @@
     return raiseInvalidTableData(entry.identity);
   }
 
-  MOZ_TRY(table.impl.initWithSingleValue(cx_, indexByte != 0));
+  MOZ_TRY(table.initWithSingleValue(cx_, indexByte != 0));
+#ifdef DEBUG
+  table.selfCheck();
+#endif  // DEBUG
   return Ok();
 }
 
@@ -1771,8 +2279,11 @@
     return raiseInvalidTableData(entry.identity);
   }
 
-  MOZ_TRY(table.impl.initWithSingleValue(
+  MOZ_TRY(table.initWithSingleValue(
       cx_, indexByte == 0 ? BinASTKind::_Null : entry.kind));
+#ifdef DEBUG
+  table.selfCheck();
+#endif  // DEBUG
   return Ok();
 }
 
@@ -1804,7 +2315,10 @@
     return raiseInvalidTableData(sum.identity);
   }
 
-  MOZ_TRY(table.impl.initWithSingleValue(cx_, sum.interfaceAt(index)));
+  MOZ_TRY(table.initWithSingleValue(cx_, sum.interfaceAt(index)));
+#ifdef DEBUG
+  table.selfCheck();
+#endif  // DEBUG
   return Ok();
 }
 
@@ -1838,7 +2352,10 @@
     return raiseInvalidTableData(sum.identity);
   }
 
-  MOZ_TRY(table.impl.initWithSingleValue(cx_, sum.interfaceAt(index)));
+  MOZ_TRY(table.initWithSingleValue(cx_, sum.interfaceAt(index)));
+#ifdef DEBUG
+  table.selfCheck();
+#endif  // DEBUG
   return Ok();
 }
 
@@ -1882,9 +2399,12 @@
   BINJS_MOZ_TRY_DECL(value, readSymbol(number, 0 /* ignored */));
   // Note: The `std::move` is useless for performance, but necessary to keep
   // a consistent API.
-  MOZ_TRY(table.impl.initWithSingleValue(
+  MOZ_TRY(table.initWithSingleValue(
       cx_,
       /* NOLINT(performance-move-const-arg) */ std::move(value)));
+#ifdef DEBUG
+  table.selfCheck();
+#endif  // DEBUG
   return Ok();
 }
 
@@ -1921,7 +2441,10 @@
   if (length > MAX_LIST_LENGTH) {
     return raiseInvalidTableData(list.identity);
   }
-  MOZ_TRY(table.impl.initWithSingleValue(cx_, std::move(length)));
+  MOZ_TRY(table.initWithSingleValue(cx_, std::move(length)));
+#ifdef DEBUG
+  table.selfCheck();
+#endif  // DEBUG
   return Ok();
 }
 
@@ -1962,9 +2485,12 @@
   // Note: The `std::move` is useless for performance, but necessary to keep
   // a consistent API.
   JSAtom* value = reader.metadata_->getAtom(index);
-  MOZ_TRY(table.impl.initWithSingleValue(
+  MOZ_TRY(table.initWithSingleValue(
       cx_,
       /* NOLINT(performance-move-const-arg) */ std::move(value)));
+#ifdef DEBUG
+  table.selfCheck();
+#endif  // DEBUG
   return Ok();
 }
 
@@ -2011,9 +2537,12 @@
   JSAtom* symbol = index == 0 ? nullptr : reader.metadata_->getAtom(index - 1);
   // Note: The `std::move` is useless for performance, but necessary to keep
   // a consistent API.
-  MOZ_TRY(table.impl.initWithSingleValue(
+  MOZ_TRY(table.initWithSingleValue(
       cx_,
       /* NOLINT(performance-move-const-arg) */ std::move(symbol)));
+#ifdef DEBUG
+  table.selfCheck();
+#endif  // DEBUG
   return Ok();
 }
 
@@ -2047,9 +2576,12 @@
   BinASTVariant symbol = entry.variantAt(index);
   // Note: The `std::move` is useless for performance, but necessary to keep
   // a consistent API.
-  MOZ_TRY(table.impl.initWithSingleValue(
+  MOZ_TRY(table.initWithSingleValue(
       cx_,
       /* NOLINT(performance-move-const-arg) */ std::move(symbol)));
+#ifdef DEBUG
+  table.selfCheck();
+#endif  // DEBUG
   return Ok();
 }
 
@@ -2082,9 +2614,12 @@
   BINJS_MOZ_TRY_DECL(index, reader.readUnpackedLong());
   // Note: The `std::move` is useless for performance, but necessary to keep
   // a consistent API.
-  MOZ_TRY(table.impl.initWithSingleValue(
+  MOZ_TRY(table.initWithSingleValue(
       cx_,
       /* NOLINT(performance-move-const-arg) */ std::move(index)));
+#ifdef DEBUG
+  table.selfCheck();
+#endif  // DEBUG
   return Ok();
 }
 
@@ -2094,7 +2629,7 @@
       listLengths(BINAST_PARAM_NUMBER_OF_LIST_TYPES(
           mozilla::AsVariant(HuffmanTableUnreachable()))) {}
 
-HuffmanTable& HuffmanDictionary::tableForField(
+HuffmanTableValue& HuffmanDictionary::tableForField(
     NormalizedInterfaceAndField index) {
   return fields[static_cast<size_t>(index.identity)];
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/frontend/BinASTTokenReaderContext.h firefox-trunk-71.0~a1~hg20190915r493291/js/src/frontend/BinASTTokenReaderContext.h
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/frontend/BinASTTokenReaderContext.h	2019-09-13 05:13:16.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/frontend/BinASTTokenReaderContext.h	2019-09-15 11:33:12.000000000 +0000
@@ -109,11 +109,7 @@
   // For instance, if the Huffman code is `0100`,
   // - `bits = 0b0000_0000__0000_0000__0000_0000__0000_0100`;
   // - `bitLength = 4`.
-  HuffmanKey(const uint32_t bits, const uint8_t bitLength)
-      : bits(bits), bitLength(bitLength) {
-    MOZ_ASSERT(bitLength <= 32);
-    MOZ_ASSERT_IF(bitLength != 32 /* >> 32 is UB */, bits >> bitLength == 0);
-  }
+  HuffmanKey(const uint32_t bits, const uint8_t bitLength);
 
   // The buffer holding the bits.
   //
@@ -132,6 +128,33 @@
   const uint8_t bitLength;
 };
 
+// A Huffman key represented as a single `uint32_t`.
+struct FlatHuffmanKey {
+  explicit FlatHuffmanKey(HuffmanKey key);
+  explicit FlatHuffmanKey(const HuffmanKey* key);
+
+  // 0b0000000L_LLLLCCCC_CCCCCCCC_CCCCCCCC
+  // Where:
+  // - `LLLLL` store `key.bitLength`
+  // - `CCCC_CCCCCCCC_CCCCCCCC` store `key.bits`
+  //
+  // While `key.bits` is nominally 32 bits, it is in fact
+  // `MAX_CODE_BIT_LENGTH` bits, padded with 0s in the
+  // highest bits.
+  const uint32_t representation;
+
+  // -- Implementing HashPolicy
+  using Lookup = FlatHuffmanKey;
+  using Key = Lookup;
+  static HashNumber hash(const Lookup& lookup) {
+    return mozilla::DefaultHasher<uint32_t>::hash(lookup.representation);
+  }
+  static bool match(const Key& key, const Lookup& lookup) {
+    return mozilla::DefaultHasher<uint32_t>::match(key.representation,
+                                                   lookup.representation);
+  }
+};
+
 // An entry in a Huffman table.
 template <typename T>
 struct HuffmanEntry {
@@ -143,7 +166,7 @@
   const T value;
 };
 
-// The default inline buffer length for instances of HuffmanTable.
+// The default inline buffer length for instances of HuffmanTableValue.
 // Specific type (e.g. booleans) will override this to provide something
 // more suited to their type.
 const size_t HUFFMAN_TABLE_DEFAULT_INLINE_BUFFER_LENGTH = 8;
@@ -155,11 +178,14 @@
   NonNull,
 };
 
+// An implementation of Huffman Tables as a vector, with `O(entries)`
+// lookup. Performance-wise, this implementation only makes sense for
+// very short tables.
 template <typename T, int N = HUFFMAN_TABLE_DEFAULT_INLINE_BUFFER_LENGTH>
-class HuffmanTableImpl {
+class HuffmanTableImplementationNaive {
  public:
-  explicit HuffmanTableImpl(JSContext* cx) : values(cx) {}
-  HuffmanTableImpl(HuffmanTableImpl&& other) noexcept
+  explicit HuffmanTableImplementationNaive(JSContext* cx) : values(cx) {}
+  HuffmanTableImplementationNaive(HuffmanTableImplementationNaive&& other)
       : values(std::move(other.values)) {}
 
   // Initialize a Huffman table containing a single value.
@@ -167,22 +193,27 @@
 
   // Initialize a Huffman table containing `numberOfSymbols`.
   // Symbols must be added with `addSymbol`.
-  JS::Result<Ok> init(JSContext* cx, size_t numberOfSymbols);
+  JS::Result<Ok> init(JSContext* cx, size_t numberOfSymbols,
+                      uint8_t largestBitLength);
 
   // Add a symbol to a value.
   JS::Result<Ok> addSymbol(uint32_t bits, uint8_t bits_length, T&& value);
 
-  HuffmanTableImpl() = delete;
-  HuffmanTableImpl(HuffmanTableImpl&) = delete;
+  HuffmanTableImplementationNaive() = delete;
+  HuffmanTableImplementationNaive(HuffmanTableImplementationNaive&) = delete;
+
+#ifdef DEBUG
+  void selfCheck();
+#endif  // DEBUG
 
   // Lookup a value in the table.
   //
   // Return an entry with a value of `nullptr` if the value is not in the table.
   //
-  // The lookup may consume `[0, key.bitLength]` bits of `key`. Typically, in a
-  // table with a single instance, or if the value is not in the table, 0 bits
-  // will be consumed. The caller is responsible for advancing its bitstream by
-  // `result.key.bitLength` bits.
+  // The lookup may advance `key` by `[0, key.bitLength]` bits. Typically, in a
+  // table with a single instance, or if the value is not in the table, it
+  // will advance by 0 bits. The caller is responsible for advancing its
+  // bitstream by `result.key.bitLength` bits.
   HuffmanEntry<const T*> lookup(HuffmanLookup key) const;
 
   // The number of values in the table.
@@ -200,91 +231,411 @@
   friend class HuffmanPreludeReader;
 };
 
+// An implementation of Huffman Tables as a hash map. Space-Efficient,
+// faster than HuffmanTableImplementationNaive for large tables but not terribly
+// fast, either.
+//
+// Complexity:
+//
+// - We assume that hashing is sufficient to guarantee `O(1)` lookups
+//   inside the hashmap.
+// - On a well-formed file, all lookups are successful and a Huffman
+//   lookup will take exactly `bitLen` Hashmap lookups. This makes it
+//   `O(MAX_CODE_BIT_LENGTH)` worst case. This also makes it
+//   `O(ln(N))` in the best case (perfectly balanced Huffman table)
+//   and `O(N)` in the worst case (perfectly linear Huffman table),
+//   where `N` is the number of entries.
+// - On an invalid file, the number of lookups is also bounded by
+//   `MAX_CODE_BIT_LENGTH`.
+template <typename T>
+class HuffmanTableImplementationMap {
+ public:
+  explicit HuffmanTableImplementationMap(JSContext* cx)
+      : values(cx), keys(cx) {}
+  HuffmanTableImplementationMap(HuffmanTableImplementationMap&& other) noexcept
+      : values(std::move(other.values)), keys(std::move(other.keys)) {}
+
+  // Initialize a Huffman table containing a single value.
+  JS::Result<Ok> initWithSingleValue(JSContext* cx, T&& value);
+
+  // Initialize a Huffman table containing `numberOfSymbols`.
+  // Symbols must be added with `addSymbol`.
+  JS::Result<Ok> init(JSContext* cx, size_t numberOfSymbols,
+                      uint8_t largestBitLength);
+
+  // Add a `(bit, bits_length) => value` mapping.
+  JS::Result<Ok> addSymbol(uint32_t bits, uint8_t bits_length, T&& value);
+
+#ifdef DEBUG
+  void selfCheck();
+#endif  // DEBUG
+
+  HuffmanTableImplementationMap() = delete;
+  HuffmanTableImplementationMap(HuffmanTableImplementationMap&) = delete;
+
+  // Lookup a value in the table.
+  //
+  // Return an entry with a value of `nullptr` if the value is not in the table.
+  //
+  // The lookup may advance `key` by `[0, key.bitLength]` bits. Typically, in a
+  // table with a single instance, or if the value is not in the table, it
+  // will advance by 0 bits. The caller is responsible for advancing its
+  // bitstream by `result.key.bitLength` bits.
+  HuffmanEntry<const T*> lookup(HuffmanLookup key) const;
+
+  // The number of values in the table.
+  size_t length() const { return values.length(); }
+
+  // Iterating in the order of insertion.
+  struct Iterator {
+    Iterator(const js::HashMap<FlatHuffmanKey, T, FlatHuffmanKey>& values,
+             const HuffmanKey* position)
+        : values(values), position(position) {}
+    void operator++() { ++position; }
+    const T* operator*() const {
+      const FlatHuffmanKey key(position);
+      if (const auto ptr = values.lookup(key)) {
+        return &ptr->value();
+      }
+      MOZ_CRASH();
+    }
+    bool operator==(const Iterator& other) const {
+      MOZ_ASSERT(&values == &other.values);
+      return position == other.position;
+    }
+    bool operator!=(const Iterator& other) const {
+      MOZ_ASSERT(&values == &other.values);
+      return position != other.position;
+    }
+
+   private:
+    const js::HashMap<FlatHuffmanKey, T, FlatHuffmanKey>& values;
+    const HuffmanKey* position;
+  };
+  Iterator begin() const { return Iterator(values, keys.begin()); }
+  Iterator end() const { return Iterator(values, keys.end()); }
+
+ private:
+  // The entries in this Huffman table, prepared for lookup.
+  js::HashMap<FlatHuffmanKey, T, FlatHuffmanKey> values;
+
+  // The entries in this Huffman Table, sorted in the order of insertion.
+  Vector<HuffmanKey> keys;
+
+  friend class HuffmanPreludeReader;
+};
+
+// An implementation of Huffman Tables as a vector designed to allow
+// constant-time lookups at the expense of high space complexity.
+//
+// # Time complexity
+//
+// Lookups take constant time, which essentially consists in two
+// simple vector lookups.
+//
+// # Space complexity
+//
+// After initialization, a `HuffmanTableImplementationSaturated`
+// requires O(2 ^ max bit length in the table) space:
+//
+// - A vector `values` containing one entry per symbol.
+// - A vector `saturated` containing exactly 2 ^ (max bit length in the
+//   table) entries, which we use to map any combination of `maxBitLength`
+//   bits onto the only `HuffmanEntry` that may be reached by a prefix
+//   of these `maxBitLength` bits. See below for more details.
+//
+// # Algorithm
+//
+// Consider the following Huffman table
+//
+// Symbol | Binary Code  | Int value of Code | Bit Length
+// ------ | ------------ | ----------------- | ----------
+// A      | 11000        | 24                | 5
+// B      | 11001        | 25                | 5
+// C      | 1101         | 13                | 4
+// D      | 100          | 4                 | 3
+// E      | 101          | 5                 | 3
+// F      | 111          | 7                 | 3
+// G      | 00           | 0                 | 2
+// H      | 01           | 1                 | 2
+//
+// By definition of a Huffman Table, the Binary Codes represent
+// paths in a Huffman Tree. Consequently, padding these codes
+// to the end would not change the result.
+//
+// Symbol | Binary Code  | Int value of Code | Bit Length
+// ------ | ------------ | ----------------- | ----------
+// A      | 11000        | 24                | 5
+// B      | 11001        | 25                | 5
+// C      | 1101?        | [26...27]         | 4
+// D      | 100??        | [16...19]         | 3
+// E      | 101??        | [20..23]          | 3
+// F      | 111??        | [28..31]          | 3
+// G      | 00???        | [0...7]           | 2
+// H      | 01???        | [8...15]          | 2
+//
+// Row "Int value of Code" now contains all possible values
+// that may be expressed in 5 bits. By using these values
+// as array indices, we may therefore represent the
+// Huffman table as an array:
+//
+// Index     |   Symbol   |   Bit Length
+// --------- | ---------- | -------------
+// [0...7]   |  G         | 2
+// [8...15]  |  H         | 2
+// [16...19] |  D         | 3
+// [20...23] |  E         | 3
+// 24        |  A         | 5
+// 25        |  B         | 5
+// [26...27] |  C         | 4
+// [28...31] |  F         | 3
+//
+// By using the next 5 bits in the bit buffer, we may, in
+// a single lookup, determine the symbol and the bit length.
+//
+// In the current implementation, to save some space, we have
+// two distinct arrays, one (`values`) with a single instance of each
+// symbols bit length, and one (`saturated`) with indices into that
+// array.
+template <typename T>
+class HuffmanTableImplementationSaturated {
+ public:
+  explicit HuffmanTableImplementationSaturated(JSContext* cx)
+      : values(cx), saturated(cx), maxBitLength(-1) {}
+  HuffmanTableImplementationSaturated(
+      HuffmanTableImplementationSaturated&& other) = default;
+
+  // Initialize a Huffman table containing a single value.
+  JS::Result<Ok> initWithSingleValue(JSContext* cx, T&& value);
+
+  // Initialize a Huffman table containing `numberOfSymbols`.
+  // Symbols must be added with `addSymbol`.
+  JS::Result<Ok> init(JSContext* cx, size_t numberOfSymbols,
+                      uint8_t largestBitLength);
+
+#ifdef DEBUG
+  void selfCheck();
+#endif  // DEBUG
+
+  // Add a `(bit, bits_length) => value` mapping.
+  JS::Result<Ok> addSymbol(uint32_t bits, uint8_t bits_length, T&& value);
+
+  HuffmanTableImplementationSaturated() = delete;
+  HuffmanTableImplementationSaturated(HuffmanTableImplementationSaturated&) =
+      delete;
+
+  // Lookup a value in the table.
+  //
+  // Return an entry with a value of `nullptr` if the value is not in the table.
+  //
+  // The lookup may advance `key` by `[0, key.bitLength]` bits. Typically, in a
+  // table with a single instance, or if the value is not in the table, it
+  // will advance by 0 bits. The caller is responsible for advancing its
+  // bitstream by `result.key.bitLength` bits.
+  HuffmanEntry<const T*> lookup(HuffmanLookup key) const;
+
+  // The number of values in the table.
+  size_t length() const { return values.length(); }
+
+  // Iterating in the order of insertion.
+  struct Iterator {
+    explicit Iterator(const HuffmanEntry<T>* position);
+    void operator++();
+    const T* operator*() const;
+    bool operator==(const Iterator& other) const;
+    bool operator!=(const Iterator& other) const;
+
+   private:
+    const HuffmanEntry<T>* position;
+  };
+  Iterator begin() const { return Iterator(values.begin()); }
+  Iterator end() const { return Iterator(values.end()); }
+
+ public:
+  // An index into table `values`.
+  // We use `uint8_t` instead of `size_t` to limit the space
+  // used by the table.
+  using InternalIndex = uint8_t;
+
+ private:
+  // The entries in this Huffman Table, sorted in the order of insertion.
+  //
+  // Invariant (once `init*` has been called):
+  // - Length is the number of values inserted in the table.
+  // - for all i, `values[i].bitLength <= maxBitLength`.
+  Vector<HuffmanEntry<T>> values;
+
+  // The entries in this Huffman table, prepared for lookup.
+  //
+  // Invariant (once `init*` has been called):
+  // - Length is `1 << maxBitLength`.
+  // - for all i, `saturated[i] < values.length()`
+  Vector<InternalIndex> saturated;
+
+  // The maximal bitlength of a value in this table.
+  //
+  // Invariant (once `init*` has been called):
+  // - `maxBitLength <= MAX_CODE_BIT_LENGTH`
+  uint8_t maxBitLength;
+
+  friend class HuffmanPreludeReader;
+};
+
 // An empty Huffman table. Attempting to get a value from this table is a syntax
-// error. This is the default value for `HuffmanTable` and represents all states
-// that may not be reached.
+// error. This is the default value for `HuffmanTableValue` and represents all
+// states that may not be reached.
 //
-// Part of variants `HuffmanTable` and `HuffmanTableListLength`.
+// Part of variants `HuffmanTableValue`, `HuffmanTableListLength` and
+// `HuffmanTableImplementationGeneric::implementation`.
 struct HuffmanTableUnreachable {};
 
+// Generic implementation of Huffman tables.
+//
+//
+template <typename T>
+struct HuffmanTableImplementationGeneric {
+  explicit HuffmanTableImplementationGeneric(JSContext* cx);
+  explicit HuffmanTableImplementationGeneric() = delete;
+
+  // Initialize a Huffman table containing a single value.
+  JS::Result<Ok> initWithSingleValue(JSContext* cx, T&& value);
+
+  // Initialize a Huffman table containing `numberOfSymbols`.
+  // Symbols must be added with `addSymbol`.
+  JS::Result<Ok> init(JSContext* cx, size_t numberOfSymbols,
+                      uint8_t largestBitLength);
+
+#ifdef DEBUG
+  void selfCheck();
+#endif  // DEBUG
+
+  // Add a `(bit, bits_length) => value` mapping.
+  JS::Result<Ok> addSymbol(uint32_t bits, uint8_t bits_length, T&& value);
+
+  // The number of values in the table.
+  size_t length() const;
+
+  struct Iterator {
+    explicit Iterator(
+        typename HuffmanTableImplementationSaturated<T>::Iterator&&);
+    explicit Iterator(typename HuffmanTableImplementationMap<T>::Iterator&&);
+    Iterator(Iterator&&) = default;
+    Iterator(const Iterator&) = default;
+    void operator++();
+    const T* operator*() const;
+    bool operator==(const Iterator& other) const;
+    bool operator!=(const Iterator& other) const;
+
+   private:
+    mozilla::Variant<typename HuffmanTableImplementationSaturated<T>::Iterator,
+                     typename HuffmanTableImplementationMap<T>::Iterator>
+        implementation;
+  };
+
+  // Iterating in the order of insertion.
+  Iterator begin() const;
+  Iterator end() const;
+
+  // Lookup a value in the table.
+  //
+  // Return an entry with a value of `nullptr` if the value is not in the table.
+  //
+  // The lookup may advance `key` by `[0, key.bitLength]` bits. Typically, in a
+  // table with a single instance, or if the value is not in the table, it
+  // will advance by 0 bits. The caller is responsible for advancing its
+  // bitstream by `result.key.bitLength` bits.
+  HuffmanEntry<const T*> lookup(HuffmanLookup key) const;
+
+ private:
+  mozilla::Variant<HuffmanTableImplementationSaturated<T>,
+                   HuffmanTableImplementationMap<T>, HuffmanTableUnreachable>
+      implementation;
+};
+
 // While reading the Huffman prelude, whenever we first encounter a
 // `HuffmanTableUnreachable`, we replace it with a `HuffmanTableInitializing`
 // to mark that we should not attempt to read/initialize it again.
 //
 // Attempting to get a value from this table is an internal error.
 //
-// Part of variants `HuffmanTable` and `HuffmanTableListLength`.
+// Part of variants `HuffmanTableValue` and `HuffmanTableListLength`.
 struct HuffmanTableInitializing {};
 
-// --- Explicit instantiations of `HuffmanTableImpl`.
-// These classes are all parts of variant `HuffmanTable`.
+// These classes are all parts of variant `HuffmanTableValue`.
 
-struct HuffmanTableExplicitSymbolsF64 {
+struct HuffmanTableExplicitSymbolsF64
+    : HuffmanTableImplementationGeneric<double> {
   using Contents = double;
-  HuffmanTableImpl<double> impl;
-  explicit HuffmanTableExplicitSymbolsF64(JSContext* cx) : impl(cx) {}
+  explicit HuffmanTableExplicitSymbolsF64(JSContext* cx)
+      : HuffmanTableImplementationGeneric(cx) {}
 };
 
-struct HuffmanTableExplicitSymbolsU32 {
+struct HuffmanTableExplicitSymbolsU32
+    : HuffmanTableImplementationGeneric<uint32_t> {
   using Contents = uint32_t;
-  HuffmanTableImpl<uint32_t> impl;
-  explicit HuffmanTableExplicitSymbolsU32(JSContext* cx) : impl(cx) {}
+  explicit HuffmanTableExplicitSymbolsU32(JSContext* cx)
+      : HuffmanTableImplementationGeneric(cx) {}
 };
 
-struct HuffmanTableIndexedSymbolsSum {
+struct HuffmanTableIndexedSymbolsSum
+    : HuffmanTableImplementationGeneric<BinASTKind> {
   using Contents = BinASTKind;
-  HuffmanTableImpl<BinASTKind> impl;
-  explicit HuffmanTableIndexedSymbolsSum(JSContext* cx) : impl(cx) {}
+  explicit HuffmanTableIndexedSymbolsSum(JSContext* cx)
+      : HuffmanTableImplementationGeneric(cx) {}
 };
 
-struct HuffmanTableIndexedSymbolsBool {
+struct HuffmanTableIndexedSymbolsBool
+    : HuffmanTableImplementationNaive<bool, 2> {
   using Contents = bool;
-  HuffmanTableImpl<bool, 2> impl;
-  explicit HuffmanTableIndexedSymbolsBool(JSContext* cx) : impl(cx) {}
+  explicit HuffmanTableIndexedSymbolsBool(JSContext* cx)
+      : HuffmanTableImplementationNaive(cx) {}
 };
 
 // A Huffman table that may only ever contain two values:
 // `BinASTKind::_Null` and another `BinASTKind`.
-struct HuffmanTableIndexedSymbolsMaybeInterface {
+struct HuffmanTableIndexedSymbolsMaybeInterface
+    : HuffmanTableImplementationNaive<BinASTKind, 2> {
   using Contents = BinASTKind;
-  HuffmanTableImpl<BinASTKind, 2> impl;
-  explicit HuffmanTableIndexedSymbolsMaybeInterface(JSContext* cx) : impl(cx) {}
+  explicit HuffmanTableIndexedSymbolsMaybeInterface(JSContext* cx)
+      : HuffmanTableImplementationNaive(cx) {}
 
   // `true` if this table only contains values for `null`.
   bool isAlwaysNull() const {
-    MOZ_ASSERT(impl.length() > 0);
+    MOZ_ASSERT(length() > 0);
 
     // By definition, we have either 1 or 2 values.
     // By definition, if we have 2 values, one of them is not null.
-    if (impl.length() != 1) {
+    if (length() != 1) {
       return false;
     }
     // Otherwise, check the single value.
-    return impl.begin()->value == BinASTKind::_Null;
+    return begin()->value == BinASTKind::_Null;
   }
 };
 
-struct HuffmanTableIndexedSymbolsStringEnum {
+struct HuffmanTableIndexedSymbolsStringEnum
+    : HuffmanTableImplementationGeneric<BinASTVariant> {
   using Contents = BinASTVariant;
-  HuffmanTableImpl<BinASTVariant> impl;
-  explicit HuffmanTableIndexedSymbolsStringEnum(JSContext* cx) : impl(cx) {}
+  explicit HuffmanTableIndexedSymbolsStringEnum(JSContext* cx)
+      : HuffmanTableImplementationGeneric(cx) {}
 };
 
-struct HuffmanTableIndexedSymbolsLiteralString {
+struct HuffmanTableIndexedSymbolsLiteralString
+    : HuffmanTableImplementationGeneric<JSAtom*> {
   using Contents = JSAtom*;
-  HuffmanTableImpl<JSAtom*> impl;
-  explicit HuffmanTableIndexedSymbolsLiteralString(JSContext* cx) : impl(cx) {}
+  explicit HuffmanTableIndexedSymbolsLiteralString(JSContext* cx)
+      : HuffmanTableImplementationGeneric(cx) {}
 };
 
-struct HuffmanTableIndexedSymbolsOptionalLiteralString {
+struct HuffmanTableIndexedSymbolsOptionalLiteralString
+    : HuffmanTableImplementationGeneric<JSAtom*> {
   using Contents = JSAtom*;
-  HuffmanTableImpl<JSAtom*> impl;
   explicit HuffmanTableIndexedSymbolsOptionalLiteralString(JSContext* cx)
-      : impl(cx) {}
+      : HuffmanTableImplementationGeneric(cx) {}
 };
 
-// A single Huffman table.
-using HuffmanTable = mozilla::Variant<
+// A single Huffman table, used for values.
+using HuffmanTableValue = mozilla::Variant<
     HuffmanTableUnreachable,  // Default value.
     HuffmanTableInitializing, HuffmanTableExplicitSymbolsF64,
     HuffmanTableExplicitSymbolsU32, HuffmanTableIndexedSymbolsSum,
@@ -293,10 +644,11 @@
     HuffmanTableIndexedSymbolsLiteralString,
     HuffmanTableIndexedSymbolsOptionalLiteralString>;
 
-struct HuffmanTableExplicitSymbolsListLength {
+struct HuffmanTableExplicitSymbolsListLength
+    : HuffmanTableImplementationGeneric<uint32_t> {
   using Contents = uint32_t;
-  HuffmanTableImpl<uint32_t> impl;
-  explicit HuffmanTableExplicitSymbolsListLength(JSContext* cx) : impl(cx) {}
+  explicit HuffmanTableExplicitSymbolsListLength(JSContext* cx)
+      : HuffmanTableImplementationGeneric(cx) {}
 };
 
 // A single Huffman table, specialized for list lengths.
@@ -314,7 +666,7 @@
  public:
   explicit HuffmanDictionary(JSContext* cx);
 
-  HuffmanTable& tableForField(NormalizedInterfaceAndField index);
+  HuffmanTableValue& tableForField(NormalizedInterfaceAndField index);
   HuffmanTableListLength& tableForListLength(BinASTList list);
 
  private:
@@ -325,7 +677,7 @@
   //
   // The mapping from `(Interface, Field) -> index` is extracted statically from
   // the webidl specs.
-  mozilla::Array<HuffmanTable, BINAST_INTERFACE_AND_FIELD_LIMIT> fields;
+  mozilla::Array<HuffmanTableValue, BINAST_INTERFACE_AND_FIELD_LIMIT> fields;
 
   // Huffman tables for list lengths. Some tables may be
   // `HuffmanTableUnreacheable` if they represent lists that actually do not
@@ -638,7 +990,7 @@
  private:
   // A mapping string index => BinASTVariant as extracted from the [STRINGS]
   // section of the file. Populated lazily.
-  js::HashMap<uint32_t, BinASTVariant, DefaultHasher<uint32_t>,
+  js::HashMap<FlatHuffmanKey, BinASTVariant, DefaultHasher<uint32_t>,
               SystemAllocPolicy>
       variantsTable_;
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/gc/GC.cpp firefox-trunk-71.0~a1~hg20190915r493291/js/src/gc/GC.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/gc/GC.cpp	2019-09-13 05:13:16.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/gc/GC.cpp	2019-09-15 11:33:11.000000000 +0000
@@ -4095,28 +4095,11 @@
 
   while (!workList.empty()) {
     Compartment* comp = workList.popCopy();
-
-    // Check the cross compartment map.
     for (Compartment::WrappedObjectCompartmentEnum e(comp); !e.empty();
          e.popFront()) {
       Compartment* dest = e.front();
       if (!dest->gcState.maybeAlive) {
         dest->gcState.maybeAlive = true;
-        if (!workList.append(dest)) {
-          return;
-        }
-      }
-    }
-
-    // Check debugger cross compartment edges.
-    CompartmentSet debuggerTargets;
-    if (!DebugAPI::findCrossCompartmentTargets(rt, comp, debuggerTargets)) {
-      return;
-    }
-    for (auto e = debuggerTargets.all(); !e.empty(); e.popFront()) {
-      Compartment* dest = e.front();
-      if (!dest->gcState.maybeAlive) {
-        dest->gcState.maybeAlive = true;
         if (!workList.append(dest)) {
           return;
         }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit/BaselineJIT.cpp firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit/BaselineJIT.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit/BaselineJIT.cpp	2019-09-13 05:13:17.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit/BaselineJIT.cpp	2019-09-15 11:33:13.000000000 +0000
@@ -359,6 +359,12 @@
     return Method_CantCompile;
   }
 
+  // JITs do not respect the debugger's OnNativeCall hook, so JIT execution is
+  // disabled if this hook might need to be called.
+  if (cx->insideDebuggerEvaluationWithOnNativeCallHook) {
+    return Method_CantCompile;
+  }
+
   return CanEnterBaselineInterpreter(cx, fp->script());
 }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit/Jit.cpp firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit/Jit.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit/Jit.cpp	2019-09-13 05:13:17.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit/Jit.cpp	2019-09-15 11:33:13.000000000 +0000
@@ -138,6 +138,12 @@
     return EnterJitStatus::NotEntered;
   }
 
+  // JITs do not respect the debugger's OnNativeCall hook, so JIT execution is
+  // disabled if this hook might need to be called.
+  if (cx->insideDebuggerEvaluationWithOnNativeCallHook) {
+    return EnterJitStatus::NotEntered;
+  }
+
   JSScript* script = state.script();
 
   uint8_t* code = script->jitCodeRaw();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit-test/tests/debug/Debugger-onNativeCall-01.js firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit-test/tests/debug/Debugger-onNativeCall-01.js
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit-test/tests/debug/Debugger-onNativeCall-01.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit-test/tests/debug/Debugger-onNativeCall-01.js	2019-09-15 11:33:13.000000000 +0000
@@ -0,0 +1,64 @@
+// Test that the onNativeCall hook is called when expected.
+
+load(libdir + 'eqArrayHelper.js');
+
+var g = newGlobal({newCompartment: true});
+var dbg = Debugger(g);
+var gdbg = dbg.addDebuggee(g);
+
+g.eval(`
+const x = [];
+Object.defineProperty(x, "a", {
+  get: print,
+  set: print,
+});
+function f() {
+  x.a++;
+  x.push(4);
+}
+`);
+
+for (let i = 0; i < 5; i++) {
+  g.f();
+}
+
+const rv = [];
+dbg.onNativeCall = (callee, reason) => { rv.push(callee.name, reason); };
+
+var dbg2 = Debugger(g);
+var gdbg2 = dbg2.addDebuggee(g);
+
+const fscript = gdbg.getOwnPropertyDescriptor('f').value.script;
+
+for (let i = 0; i < 5; i++) {
+  // The onNativeCall hook is called when doing global evaluations.
+  rv.length = 0;
+  gdbg.executeInGlobal(`f()`);
+  assertEqArray(rv, ["print", "get", "print", "set", "push", "call"]);
+
+  // The onNativeCall hook is called when doing frame evaluations.
+  let handlerCalled = false;
+  const handler = {
+    hit(frame) {
+      fscript.clearBreakpoint(handler);
+      rv.length = 0;
+      frame.eval(`f()`);
+      assertEqArray(rv, ["print", "get", "print", "set", "push", "call"]);
+      handlerCalled = true;
+    },
+  };
+  fscript.setBreakpoint(fscript.mainOffset, handler);
+  g.f();
+  assertEq(handlerCalled, true);
+
+  // The onNativeCall hook is *not* called when not in a debugger evaluation.
+  rv.length = 0;
+  g.f();
+  assertEqArray(rv, []);
+
+  // The onNativeCall hook is *not* called when in a debugger evaluation
+  // associated with a different debugger.
+  rv.length = 0;
+  gdbg2.executeInGlobal(`f()`);
+  assertEqArray(rv, []);
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit-test/tests/debug/Debugger-onNativeCall-02.js firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit-test/tests/debug/Debugger-onNativeCall-02.js
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit-test/tests/debug/Debugger-onNativeCall-02.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit-test/tests/debug/Debugger-onNativeCall-02.js	2019-09-15 11:33:13.000000000 +0000
@@ -0,0 +1,61 @@
+// Test that the onNativeCall hook can control the call's behavior.
+
+var g = newGlobal({newCompartment: true});
+var dbg = Debugger(g);
+var gdbg = dbg.addDebuggee(g);
+
+g.eval(`
+var x = [];
+Object.defineProperty(x, "a", {
+  get: print,
+  set: print,
+});
+var rv;
+function f() {
+  x.a++;
+  try {
+    rv = x.push(4);
+  } catch (e) {
+    throw "rethrowing";
+  }
+}
+`);
+
+for (let i = 0; i < 5; i++) {
+  g.f();
+}
+
+for (let i = 0; i < 5; i++) {
+  // Test terminating execution.
+  dbg.onNativeCall = (callee, reason) => {
+    return null;
+  };
+  const len = g.x.length;
+  let v = gdbg.executeInGlobal(`f()`);
+  assertEq(v, null);
+  assertEq(g.x.length, len);
+
+  // Test throwing an exception.
+  dbg.onNativeCall = (callee, reason) => {
+    return { throw: "throwing" };
+  };
+  v = gdbg.executeInGlobal(`f()`);
+  assertEq(v.throw, "throwing");
+
+  // Test throwing an exception #2.
+  dbg.onNativeCall = (callee, reason) => {
+    if (callee.name == "push") {
+      return { throw: "throwing" };
+    }
+  };
+  v = gdbg.executeInGlobal(`f()`);
+  assertEq(v.throw, "rethrowing");
+
+  // Test returning a different value from the native.
+  dbg.onNativeCall = (callee, reason) => {
+    return { return: "value" };
+  };
+  v = gdbg.executeInGlobal(`f()`);
+  assertEq(v.return, undefined);
+  assertEq(g.rv, "value");
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit-test/tests/debug/Debugger-onNativeCall-03.js firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit-test/tests/debug/Debugger-onNativeCall-03.js
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit-test/tests/debug/Debugger-onNativeCall-03.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit-test/tests/debug/Debugger-onNativeCall-03.js	2019-09-15 11:33:13.000000000 +0000
@@ -0,0 +1,31 @@
+// Test onNativeCall's behavior when used with self-hosted functions.
+
+load(libdir + 'eqArrayHelper.js');
+
+var g = newGlobal({newCompartment: true});
+var dbg = Debugger(g);
+var gdbg = dbg.addDebuggee(g);
+
+const rv = [];
+
+dbg.onEnterFrame = f => {
+  rv.push("EnterFrame");
+};
+
+dbg.onNativeCall = f => {
+  rv.push(f.displayName);
+};
+
+gdbg.executeInGlobal(`
+  var x = [1,3,2];
+  x.sort((a, b) => {print(a)});
+`);
+
+// When running self-hosted code, we will see native calls to internal
+// self-hosted JS functions and intrinsic natives. Drop these from the result
+// array.
+const validNames = ["EnterFrame", "sort", "print"];
+const filtered = rv.filter(name => validNames.includes(name));
+
+assertEq(filtered.length < rv.length, true);
+assertEqArray(filtered, ["EnterFrame", "sort", "EnterFrame", "print", "EnterFrame", "print"]);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit-test/tests/debug/Debugger-onNativeCall-04.js firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit-test/tests/debug/Debugger-onNativeCall-04.js
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit-test/tests/debug/Debugger-onNativeCall-04.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit-test/tests/debug/Debugger-onNativeCall-04.js	2019-09-15 11:33:13.000000000 +0000
@@ -0,0 +1,26 @@
+// Test that onNativeCall behaves correctly when a debugger eval might enter the
+// JIT via OSR.
+
+var g = newGlobal({newCompartment: true});
+var dbg = Debugger(g);
+var gdbg = dbg.addDebuggee(g);
+
+g.eval(`
+const x = [];
+function f() {
+  for (let i = 0; i < 5; i++) {
+    x.push(i);
+  }
+}
+`);
+
+let numCalls = 0;
+dbg.onNativeCall = callee => { assertEq(callee.name, "push"); numCalls++; };
+
+var dbg2 = Debugger(g);
+
+for (let i = 0; i < 5; i++) {
+  numCalls = 0;
+  gdbg.executeInGlobal(`f()`);
+  assertEq(numCalls, 5);
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit-test/tests/debug/Object-isSameNative.js firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit-test/tests/debug/Object-isSameNative.js
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/jit-test/tests/debug/Object-isSameNative.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/jit-test/tests/debug/Object-isSameNative.js	2019-09-15 11:33:13.000000000 +0000
@@ -0,0 +1,46 @@
+// Test that the onNativeCall hook is called when expected.
+
+load(libdir + 'eqArrayHelper.js');
+
+var g = newGlobal({newCompartment: true});
+var dbg = Debugger(g);
+var gdbg = dbg.addDebuggee(g);
+
+assertEq(gdbg.getProperty("print").return.isSameNative(print), true);
+assertEq(gdbg.getProperty("print").return.isSameNative(newGlobal), false);
+
+g.eval(`
+const x = [];
+Object.defineProperty(x, "a", {
+  get: print,
+  set: print,
+});
+function f() {
+  x.a++;
+  x.length = 0;
+  x.push(4, 5, 6);
+  x.sort(print);
+}
+`);
+
+const comparisons = [
+  print,
+  Array.prototype.push,
+  Array.prototype.sort, // Note: self-hosted
+  newGlobal
+];
+
+const rv = [];
+dbg.onNativeCall = (callee, reason) => {
+  for (const fn of comparisons) {
+    if (callee.isSameNative(fn)) {
+      rv.push(fn.name);
+    }
+  }
+}
+
+for (let i = 0; i < 5; i++) {
+  rv.length = 0;
+  gdbg.executeInGlobal(`f()`);
+  assertEqArray(rv, ["print", "print", "push", "sort", "print", "print"]);
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/vm/Interpreter.cpp firefox-trunk-71.0~a1~hg20190915r493291/js/src/vm/Interpreter.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/vm/Interpreter.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/vm/Interpreter.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -429,6 +429,7 @@
 
 STATIC_PRECONDITION_ASSUME(ubound(args.argv_) >= argc)
 MOZ_ALWAYS_INLINE bool CallJSNative(JSContext* cx, Native native,
+                                    CallReason reason,
                                     const CallArgs& args) {
   TraceLoggerThread* logger = TraceLoggerForCurrentThread(cx);
   AutoTraceLog traceLog(logger, TraceLogger_Call);
@@ -437,6 +438,16 @@
     return false;
   }
 
+  switch (DebugAPI::onNativeCall(cx, args, reason)) {
+    case ResumeMode::Continue:
+      break;
+    case ResumeMode::Throw:
+    case ResumeMode::Terminate:
+      return false;
+    case ResumeMode::Return:
+      return true;
+  }
+
 #ifdef DEBUG
   bool alreadyThrowing = cx->isExceptionPending();
 #endif
@@ -460,7 +471,7 @@
 #endif
 
   MOZ_ASSERT(args.thisv().isMagic());
-  if (!CallJSNative(cx, native, args)) {
+  if (!CallJSNative(cx, native, CallReason::Call, args)) {
     return false;
   }
 
@@ -491,7 +502,8 @@
  *       this step already!
  */
 bool js::InternalCallOrConstruct(JSContext* cx, const CallArgs& args,
-                                 MaybeConstruct construct) {
+                                 MaybeConstruct construct,
+                                 CallReason reason) {
   MOZ_ASSERT(args.length() <= ARGS_LENGTH_MAX);
   MOZ_ASSERT(!cx->zone()->types.activeAnalysis);
 
@@ -516,7 +528,7 @@
     JSNative call = args.callee().callHook();
     MOZ_ASSERT(call, "isCallable without a callHook?");
 
-    return CallJSNative(cx, call, args);
+    return CallJSNative(cx, call, reason, args);
   }
 
   /* Invoke native functions. */
@@ -536,7 +548,20 @@
         native = jitInfo->ignoresReturnValueMethod;
       }
     }
-    return CallJSNative(cx, native, args);
+    return CallJSNative(cx, native, reason, args);
+  }
+
+  // Self-hosted builtins are considered native by the onNativeCall hook.
+  if (fun->isSelfHostedBuiltin()) {
+    switch (DebugAPI::onNativeCall(cx, args, reason)) {
+      case ResumeMode::Continue:
+        break;
+      case ResumeMode::Throw:
+      case ResumeMode::Terminate:
+        return false;
+      case ResumeMode::Return:
+        return true;
+    }
   }
 
   if (!JSFunction::getOrCreateScript(cx, fun)) {
@@ -570,7 +595,8 @@
   return ok;
 }
 
-static bool InternalCall(JSContext* cx, const AnyInvokeArgs& args) {
+static bool InternalCall(JSContext* cx, const AnyInvokeArgs& args,
+                         CallReason reason = CallReason::Call) {
   MOZ_ASSERT(args.array() + args.length() == args.end(),
              "must pass calling arguments to a calling attempt");
 
@@ -591,7 +617,7 @@
     }
   }
 
-  return InternalCallOrConstruct(cx, args, NO_CONSTRUCT);
+  return InternalCallOrConstruct(cx, args, NO_CONSTRUCT, reason);
 }
 
 bool js::CallFromStack(JSContext* cx, const CallArgs& args) {
@@ -601,13 +627,14 @@
 // ES7 rev 0c1bd3004329336774cbc90de727cd0cf5f11e93
 // 7.3.12 Call.
 bool js::Call(JSContext* cx, HandleValue fval, HandleValue thisv,
-              const AnyInvokeArgs& args, MutableHandleValue rval) {
+              const AnyInvokeArgs& args, MutableHandleValue rval,
+              CallReason reason) {
   // Explicitly qualify these methods to bypass AnyInvokeArgs's deliberate
   // shadowing.
   args.CallArgs::setCallee(fval);
   args.CallArgs::setThis(thisv);
 
-  if (!InternalCall(cx, args)) {
+  if (!InternalCall(cx, args, reason)) {
     return false;
   }
 
@@ -731,7 +758,7 @@
 
   FixedInvokeArgs<0> args(cx);
 
-  return Call(cx, getter, thisv, args, rval);
+  return Call(cx, getter, thisv, args, rval, CallReason::Getter);
 }
 
 bool js::CallSetter(JSContext* cx, HandleValue thisv, HandleValue setter,
@@ -745,7 +772,7 @@
   args[0].set(v);
 
   RootedValue ignored(cx);
-  return Call(cx, setter, thisv, args, &ignored);
+  return Call(cx, setter, thisv, args, &ignored, CallReason::Setter);
 }
 
 bool js::ExecuteKernel(JSContext* cx, HandleScript script,
@@ -3066,11 +3093,13 @@
       JSFunction* maybeFun;
       bool isFunction = IsFunctionObject(args.calleev(), &maybeFun);
 
-      // Use the slow path if the callee is not an interpreted function or if we
-      // have to throw an exception.
+      // Use the slow path if the callee is not an interpreted function, if we
+      // have to throw an exception, or if we might have to invoke the
+      // OnNativeCall hook for a self-hosted builtin.
       if (!isFunction || !maybeFun->isInterpreted() ||
           (construct && !maybeFun->isConstructor()) ||
-          (!construct && maybeFun->isClassConstructor())) {
+          (!construct && maybeFun->isClassConstructor()) ||
+          cx->insideDebuggerEvaluationWithOnNativeCallHook) {
         if (construct) {
           if (!ConstructFromStack(cx, args)) {
             goto error;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/vm/Interpreter.h firefox-trunk-71.0~a1~hg20190915r493291/js/src/vm/Interpreter.h
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/vm/Interpreter.h	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/vm/Interpreter.h	2019-09-15 11:33:17.000000000 +0000
@@ -45,6 +45,13 @@
                                  int numToSkip = -1,
                                  MaybeConstruct construct = NO_CONSTRUCT);
 
+// Reasons why a call could be performed, for passing onto the debugger.
+enum class CallReason {
+  Call,
+  Getter,
+  Setter
+};
+
 /*
  * Call or construct arguments that are stored in rooted memory.
  *
@@ -54,7 +61,8 @@
  *       performed, use |Invoke|.
  */
 extern bool InternalCallOrConstruct(JSContext* cx, const CallArgs& args,
-                                    MaybeConstruct construct);
+                                    MaybeConstruct construct,
+                                    CallReason reason = CallReason::Call);
 
 /*
  * These helpers take care of the infinite-recursion check necessary for
@@ -76,7 +84,8 @@
 // |rval| is written to *only* after |fval| and |thisv| have been consumed, so
 // |rval| *may* alias either argument.
 extern bool Call(JSContext* cx, HandleValue fval, HandleValue thisv,
-                 const AnyInvokeArgs& args, MutableHandleValue rval);
+                 const AnyInvokeArgs& args, MutableHandleValue rval,
+                 CallReason reason = CallReason::Call);
 
 inline bool Call(JSContext* cx, HandleValue fval, HandleValue thisv,
                  MutableHandleValue rval) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/vm/JSContext.cpp firefox-trunk-71.0~a1~hg20190915r493291/js/src/vm/JSContext.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/vm/JSContext.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/vm/JSContext.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -1294,11 +1294,11 @@
       internalJobQueue(this),
       canSkipEnqueuingJobs(this, false),
       promiseRejectionTrackerCallback(this, nullptr),
-      promiseRejectionTrackerCallbackData(this, nullptr)
+      promiseRejectionTrackerCallbackData(this, nullptr),
 #ifdef JS_STRUCTURED_SPEW
-      ,
-      structuredSpewer_()
+      structuredSpewer_(),
 #endif
+      insideDebuggerEvaluationWithOnNativeCallHook(this, nullptr)
 {
   MOZ_ASSERT(static_cast<JS::RootingContext*>(this) ==
              JS::RootingContext::get(this));
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/js/src/vm/JSContext.h firefox-trunk-71.0~a1~hg20190915r493291/js/src/vm/JSContext.h
--- firefox-trunk-71.0~a1~hg20190913r492975/js/src/vm/JSContext.h	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/js/src/vm/JSContext.h	2019-09-15 11:33:17.000000000 +0000
@@ -998,6 +998,12 @@
   js::StructuredSpewer& spewer() { return structuredSpewer_.ref(); }
 #endif
 
+  // During debugger evaluations which need to observe native calls, JITs are
+  // completely disabled. This flag indicates whether we are in this state, and
+  // the debugger which initiated the evaluation. This debugger has other
+  // references on the stack and does not need to be traced.
+  js::ContextData<js::Debugger*> insideDebuggerEvaluationWithOnNativeCallHook;
+
 }; /* struct JSContext */
 
 inline JS::Result<> JSContext::boolToResult(bool ok) {
@@ -1243,6 +1249,20 @@
   inline ~AutoKeepAtoms();
 };
 
+class MOZ_RAII AutoNoteDebuggerEvaluationWithOnNativeCallHook {
+  JSContext* cx;
+  Debugger* oldValue;
+ public:
+  AutoNoteDebuggerEvaluationWithOnNativeCallHook(JSContext* cx, Debugger* dbg)
+      : cx(cx), oldValue(cx->insideDebuggerEvaluationWithOnNativeCallHook) {
+    cx->insideDebuggerEvaluationWithOnNativeCallHook = dbg;
+  }
+
+  ~AutoNoteDebuggerEvaluationWithOnNativeCallHook() {
+    cx->insideDebuggerEvaluationWithOnNativeCallHook = oldValue;
+  }
+};
+
 enum UnsafeABIStrictness {
   NoExceptions,
   AllowPendingExceptions,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/browser/browser/aboutConfig.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/browser/browser/aboutConfig.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/browser/browser/aboutConfig.ftl	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/browser/browser/aboutConfig.ftl	2019-09-15 11:35:05.000000000 +0000
@@ -10,6 +10,8 @@
 about-config2-title = Kefluniadurioù araoket
 about-config-search-input =
     .placeholder = Klask
+about-config-search-input1 =
+    .placeholder = Klask un anv gwellvezioù
 about-config-show-all = Diskouez an holl
 about-config-pref-add = Ouzhpennañ
 about-config-pref-toggle = Trec'haoliñ
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/browser/browser/newtab/asrouter.ftl	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/browser/browser/newtab/asrouter.ftl	2019-09-15 11:35:05.000000000 +0000
@@ -142,3 +142,16 @@
 cfr-doorhanger-firefox-send-body = Mirit ho teulioù kizidik da vezañ spiet gant an enrinegañ penn-ouzh-penn hag un ere a vo dilamet ur wech ma vo echu ganeoc'h.
 cfr-doorhanger-firefox-send-ok-button = Esaeit { -send-brand-name }
     .accesskey = E
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Gwelout ar gwarezioù
+    .accesskey = G
+cfr-doorhanger-socialtracking-close-button = Serriñ
+    .accesskey = S
+cfr-doorhanger-socialtracking-heading = { -brand-short-name } en deus harzhet ur rouedad kevredadel d'hoc'h heuliañ amañ
+cfr-doorhanger-socialtracking-description = Pouezus eo ho puhez prevez. { -brand-short-name } a stank an heulierien media kevredadel boutin evit bevenniñ ar c'hementad a roadennoù a c'hallont dastum diwar-benn ar pezh a rit enlinenn.
+cfr-doorhanger-fingerprinters-heading = Stanket eo bet un dinoerien roudoù niverel gant { -brand-short-name } war ar bajenn-mañ
+cfr-doorhanger-fingerprinters-description = Pouezus eo ho puhez prevez. { -brand-short-name } a stank an dinoerien roudoù niverel, a zastum titouroù a c'hall servij da adanavezout ac'hanoc'h hag heuliañ ac'hanoc'h.
+cfr-doorhanger-cryptominers-heading = { -brand-short-name } en deus stanket ur c'hriptogleuzier war ar bajenn-mañ
+cfr-doorhanger-cryptominers-description = Pouezus eo ho puhez prevez. { -brand-short-name } a stank kriptogleuzierien, a c'hall implij galloud jediñ ho reizhiad evit mengleuziañ arc'hant niverel.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/browser/browser/preferences/preferences.ftl	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/browser/browser/preferences/preferences.ftl	2019-09-15 11:35:05.000000000 +0000
@@ -739,6 +739,7 @@
 content-blocking-header = Stankañ endalc'hadoù
 content-blocking-section-description = Gwarezit ho puhez prevez pa verdeit. Stankit an endalc'hadoù diwelus a heuilh al lec'hiennoù a weladennit hag a sav un aelad diwar ho penn. Stankañ ul lodenn eus an endalc'had-mañ a c'hall lakaat ar pajennoù da gargañ buanoc'h.
 content-blocking-enhanced-tracking-protection = Gwarez heuliañ araoket
+content-blocking-section-top-level-description = An heulierien a heuilh ac'hanoc'h enlinenn evit tapout titouroù diwar-benn ho poazioù merdeiñ hag ho kreizennoù dedenn. { -brand-short-name } a stank lodenn vrasañ anezho.
 content-blocking-learn-more = Gouzout hiroc'h
 # The terminology used to refer to categories of Content Blocking is also used in chrome/browser/browser.properties and should be translated consistently.
 # "Standard" in this case is an adjective, meaning "default" or "normal".
@@ -756,15 +757,41 @@
 content-blocking-custom-desc = Dibabit petra stankañ.
 content-blocking-private-trackers = An heulierien anavezet er merdeiñ prevez hepken
 content-blocking-third-party-cookies = Toupinoù heuliañ tredeoù
+
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
+# "Standard" in this case is an adjective, meaning "default" or "normal".
+enhanced-tracking-protection-setting-standard =
+    .label = Skoueriek
+    .accesskey = S
+enhanced-tracking-protection-setting-strict =
+    .label = Strizh
+    .accesskey = S
+enhanced-tracking-protection-setting-custom =
+    .label = Personelaet
+    .accesskey = P
+
+
+
+content-blocking-etp-standard-desc = Kempouez etre gwarez ha digonusted. Ar pajennoù a gargo en un doare ordinal.
+content-blocking-etp-strict-desc = Gwarez kreñvoc'h, met gallout a ra lakaat lec'hiennoù 'zo da derriñ.
+content-blocking-etp-custom-desc = Dibabit pe heulier pe skript herzel.
+content-blocking-private-windows = Heulierien er prenestroù prevez
+content-blocking-cross-site-tracking-cookies = Toupinoù heuliañ etre-lec'hienn
+content-blocking-social-media-trackers = Heulierien media kevredadel
 content-blocking-all-cookies = An holl doupinoù
 content-blocking-unvisited-cookies = Toupinoù al lec'hiennoù n'int ket bet gweladennet
 content-blocking-all-windows-trackers = An holl heulierien en holl brenestroù
+content-blocking-all-windows-tracking-content = Endalc'had heuliañ en holl brenestroù
 content-blocking-all-third-party-cookies = Holl doupinoù an tredeoù
 content-blocking-cryptominers = Kriptogleuzerien
 content-blocking-fingerprinters = Dinoerien roudoù niverel
 content-blocking-warning-title = Diwallit!
 content-blocking-warning-description = Stankañ endalc'hadoù a c'hall lakaat lec'hiennoù 'zo da vont en-dro a-dreuz. Aes eo diweredekaat ar stankadur evit al lec'hiennoù ho peus fiziañs eno.
 content-blocking-learn-how = Deskit penaos
+content-blocking-etp-warning-description = Stankañ an heulierien a c'hallfe kaout un efed war implij lec'hiennoù 'zo. Adkargit ur bajenn gant an heulierien evit kargañ pep tra.
+content-blocking-warning-learn-how = Deskit penaos
 content-blocking-reload-description = Ezhomm ho po da adkargañ hoc'h ivinelloù evit arloañ ar c'hemmoù.
 content-blocking-reload-tabs-button =
     .label = Adkargañ an holl ivinelloù
@@ -772,6 +799,9 @@
 content-blocking-trackers-label =
     .label = Heulierien
     .accesskey = H
+content-blocking-tracking-content-label =
+    .label = Endalc'had heuliañ
+    .accesskey = E
 content-blocking-tracking-protection-option-all-windows =
     .label = En holl brenestroù
     .accesskey = E
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/aboutdebugging.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/aboutdebugging.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/aboutdebugging.ftl	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/aboutdebugging.ftl	2019-09-15 11:35:05.000000000 +0000
@@ -263,6 +263,15 @@
 about-debugging-worker-action-push = Push
 # This string is displayed as a label of the button that starts a service worker.
 about-debugging-worker-action-start = Start
+# This string is displayed as a label of the button that pushes a test payload
+# to a service worker.
+# Note this relates to the "Push" API, which is normally not localized so it is
+# probably better to not localize it.
+about-debugging-worker-action-push2 = Push
+    .disabledTitle = Service Worker push is currently disabled for multiprocess { -brand-shorter-name }
+# This string is displayed as a label of the button that starts a service worker.
+about-debugging-worker-action-start2 = Start
+    .disabledTitle = Service Worker start is currently disabled for multiprocess { -brand-shorter-name }
 # This string is displayed as a label of the button that unregisters a service worker.
 about-debugging-worker-action-unregister = Unregister
 # Displayed for service workers in runtime pages that listen to Fetch events.
@@ -287,6 +296,9 @@
 # of a worker
 about-debugging-worker-push-service =
     .label = Push Service
+# Displayed as title of the inspect button when service worker debugging is disabled.
+about-debugging-worker-inspect-action-disabled =
+    .title = Service Worker inspection is currently disabled for multiprocess { -brand-shorter-name }
 # Displayed as name for the Main Process debug target in the Processes category. Only for
 # remote runtimes, if `devtools.aboutdebugging.process-debugging` is true.
 about-debugging-main-process-name = Main Process
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/accessibility.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/accessibility.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/accessibility.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/accessibility.ftl	2019-09-15 11:35:05.000000000 +0000
@@ -0,0 +1,55 @@
+# 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/.
+
+
+### These strings are used inside the Accessibility panel.
+
+accessibility-learn-more = Learn more
+accessibility-text-label-header = Text Labels and Names
+accessibility-keyboard-header = Keyboard
+
+## Text entries that are used as text alternative for icons that depict accessibility isses.
+
+accessibility-warning =
+    .alt = Warning
+accessibility-fail =
+    .alt = Error
+accessibility-best-practices =
+    .alt = Best Practices
+
+## Text entries for a paragraph used in the accessibility panel sidebar's checks section
+## that describe that currently selected accessible object has an accessibility issue
+## with its text label or accessible name.
+
+accessibility-text-label-issue-area = Use <code>alt</code> attribute to label <div>area</div> elements that have the <span>href</span> attribute. <a>Learn more</a>
+accessibility-text-label-issue-dialog = Dialogs should be labeled. <a>Learn more</a>
+accessibility-text-label-issue-document-title = Documents must have a <code>title</code>. <a>Learn more</a>
+accessibility-text-label-issue-embed = Embedded content must be labeled. <a>Learn more</a>
+accessibility-text-label-issue-figure = Figures with optional captions should be labeled. <a>Learn more</a>
+accessibility-text-label-issue-fieldset = <code>fieldset</code> elements must be labeled. <a>Learn more</a>
+accessibility-text-label-issue-fieldset-legend = Use <code>legend</code> element to label <span>fieldset</span> elements. <a>Learn more</a>
+accessibility-text-label-issue-fieldset-legend2 = Use a <code>legend</code> element to label a <span>fieldset</span>. <a>Learn more</a>
+accessibility-text-label-issue-form = Form elements must be labeled. <a>Learn more</a>
+accessibility-text-label-issue-form-visible = Form elements should have a visible text label. <a>Learn more</a>
+accessibility-text-label-issue-frame = <code>frame</code> elements must be labeled. <a>Learn more</a>
+accessibility-text-label-issue-glyph = Use <code>alt</code> attribute to label <span>mglyph</span> elements. <a>Learn more</a>
+accessibility-text-label-issue-heading = Headings must be labeled. <a>Learn more</a>
+accessibility-text-label-issue-heading-content = Headings should have visible text content. <a>Learn more</a>
+accessibility-text-label-issue-iframe = Use <code>title</code> attribute to describe <span>iframe</span> content. <a>Learn more</a>
+accessibility-text-label-issue-image = Content with images must be labeled. <a>Learn more</a>
+accessibility-text-label-issue-interactive = Interactive elements must be labeled. <a>Learn more</a>
+accessibility-text-label-issue-optgroup-label = Use <code>label</code> attribute to label <span>optgroup</span> elements. <a>Learn more</a>
+accessibility-text-label-issue-optgroup-label2 = Use a <code>label</code> attribute to label an <span>optgroup</span>. <a>Learn more</a>
+accessibility-text-label-issue-toolbar = Toolbars must be labeled when there is more than one toolbar. <a>Learn more</a>
+
+## Text entries for a paragraph used in the accessibility panel sidebar's checks section
+## that describe that currently selected accessible object has a keyboard accessibility
+## issue.
+
+accessibility-keyboard-issue-semantics = Focusable elements should have interactive semantics. <a>Learn more</a>
+accessibility-keyboard-issue-tabindex = Avoid using <code>tabindex</code> attribute greater than zero. <a>Learn more</a>
+accessibility-keyboard-issue-action = Interactive elements must be able to be activated using a keyboard. <a>Learn more</a>
+accessibility-keyboard-issue-focusable = Interactive elements must be focusable. <a>Learn more</a>
+accessibility-keyboard-issue-focus-visible = Focusable element may be missing focus styling. <a>Learn more</a>
+accessibility-keyboard-issue-mouse-only = Clickable elements must be focusable and should have interactive semantics. <a>Learn more</a>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/accessibility.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/accessibility.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/accessibility.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/accessibility.properties	2019-09-15 11:35:05.000000000 +0000
@@ -111,11 +111,6 @@
 # section in Accessibility details sidebar.
 accessibility.checks=Gwiriadurioù
 
-# LOCALIZATION NOTE (accessibility.checks.empty): A title text used for indicating that
-# accessibility checks for a node yielded no results and another node should be
-# selected.
-accessibility.checks.empty=Select another node to continue.
-
 # LOCALIZATION NOTE (accessibility.checks.empty2): A title text used for indicating that
 # accessibility checks for a node yielded no results and another node should be
 # selected.
@@ -157,6 +152,16 @@
 # run time with the accessibility.learnMore string.
 accessibility.contrast.annotation.fail=Does not meet WCAG standards for accessible text. %S
 
+# LOCALIZATION NOTE (accessibility.contrast.annotation.FAIL): A title text for the
+# paragraph describing that the given colour contrast fails to meet the minimum level from
+# Web Content Accessibility Guidelines. %S in the content will be replaced by a link at
+# run time with the accessibility.learnMore string.
+accessibility.contrast.annotation.FAIL=Does not meet WCAG standards for accessible text. %S
+
+# LOCALIZATION NOTE (accessibility.contrast.annotation.transparent.error): A title text for the
+# paragraph suggesting a fix for error in color contrast calculation for text nodes with zero alpha.
+accessibility.contrast.annotation.transparent.error=Pick a color that is not transparent.
+
 # LOCALIZATION NOTE (accessibility.badges): A title text for the group of badges
 # that are rendered for each accessible row within the accessibility tree when
 # one or more accessibility checks fail.
@@ -167,6 +172,32 @@
 # filters the tree based on all accessibility failures within it.
 accessibility.filter.all=all
 
+# LOCALIZATION NOTE (accessibility.filter.none): A title text for the filter
+# that is rendered within the accessibility panel toolbar for a menu item that
+# resets all filtering in tree, and for the simulation menu item that resets
+# applied color matrices to the default matrix.
+accessibility.filter.none=None
+
+# LOCALIZATION NOTE (accessibility.filter.all2): A title text for the filter
+# that is rendered within the accessibility panel toolbar for a menu item that
+# filters the tree based on all accessibility failures within it.
+accessibility.filter.all2=All Issues
+
+# LOCALIZATION NOTE (accessibility.filter.contrast): A title text for the filter
+# that is rendered within the accessibility panel toolbar for a menu item that
+# filters the tree based on contrast accessibility failures within it.
+accessibility.filter.contrast=Contrast
+
+# LOCALIZATION NOTE (accessibility.filter.textLabel): A title text for the filter
+# that is rendered within the accessibility panel toolbar for a menu item that
+# filters the tree based on text label and name accessibility failures within it.
+accessibility.filter.textLabel=Text Labels
+
+# LOCALIZATION NOTE (accessibility.filter.keyboard): A title text for the filter
+# that is rendered within the accessibility panel toolbar for a menu item that
+# filters the tree based on keyboard accessibility failures within it.
+accessibility.filter.keyboard=Keyboard
+
 # LOCALIZATION NOTE (accessibility.badge.contrast): A title text for the badge
 # that is rendered within the accessible row in the accessibility tree for a
 # given accessible object that does not satisfy the WCAG guideline for colour
@@ -179,6 +210,12 @@
 # WCAG guideline for colour contrast.
 accessibility.badge.contrast.warning=contrast warning
 
+# LOCALIZATION NOTE (accessibility.badge.keyboard): A title text for the
+# badge that is rendered within the accessible row in the accessibility tree for
+# a given accessible object that does not satisfy the WCAG guideline for
+# keyboard accessibility.
+accessibility.badge.keyboard=keyboard
+
 # LOCALIZATION NOTE (accessibility.badge.textLabel): A title text for the
 # badge that is rendered within the accessible row in the accessibility tree for
 # a given accessible object that does not satisfy the WCAG guideline for text
@@ -191,6 +228,12 @@
 # satisfy the WCAG guideline for colour contrast.
 accessibility.badge.contrast.tooltip=Does not meet WCAG standards for accessible text.
 
+# LOCALIZATION NOTE (accessibility.badge.keyboard.tooltip): A title text
+# for the badge tooltip that is rendered on mouse hover over the badge in the
+# accessible row in the accessibility tree for a given accessible object that
+# does not satisfy the WCAG guideline for keyboard accessibility.
+accessibility.badge.keyboard.tooltip=Does not meet WCAG standards for keyboard accessibility.
+
 # LOCALIZATION NOTE (accessibility.badge.textLabel.tooltip): A title text
 # for the badge tooltip that is rendered on mouse hover over the badge in the
 # accessible row in the accessibility tree for a given accessible object that
@@ -202,6 +245,10 @@
 # accessibility audit.
 accessibility.tree.filters=Check for issues:
 
+# LOCALIZATION NOTE (accessibility.tree.filters.prefs): A title text for the
+# preferences button tooltip that contains preferences for accessibility audit.
+accessibility.tree.filters.prefs=Configure preferences
+
 # LOCALIZATION NOTE (accessibility.progress.initializing): A title text for the
 # accessibility panel overlay shown when accessibility audit is starting up.
 accessibility.progress.initializing=Initializing…
@@ -219,3 +266,52 @@
 # LOCALIZATION NOTE (accessibility.beta): A title text for the features in the
 # accessibility panel that are currently in beta.
 accessibility.beta=beta
+
+# LOCALIZATION NOTE (accessibility.pref.scroll.into.view.title): A title
+# text for the tooltip for the checkbox pref in the accessibility panel that
+# sets node auto scroll.
+accessibility.pref.scroll.into.view.title=Automatically scroll selected node into view
+
+# LOCALIZATION NOTE (accessibility.pref.scroll.into.view.label): A title
+# text for the checkbox pref in the accessibility panel that sets node auto
+# scroll.
+accessibility.pref.scroll.into.view.label=Scroll into view
+
+# LOCALIZATION NOTE (accessibility.documentation.label): This is the label for
+# the Documentation menu item.
+accessibility.documentation.label=Documentation…
+
+# LOCALIZATION NOTE (accessibility.simulation): A title text for the toolbar
+# within the main accessibility panel that contains a list of simulations for
+# vision deficiencies.
+accessibility.simulation=Simulate:
+
+# LOCALIZATION NOTE (accessibility.simulation.deuteranomaly): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the deuteranomaly simulation option.
+accessibility.simulation.deuteranomaly=Deuteranomaly (low green)
+
+# LOCALIZATION NOTE (accessibility.simulation.protanomaly): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the protanomaly simulation option.
+accessibility.simulation.protanomaly=Protanomaly (low red)
+
+# LOCALIZATION NOTE (accessibility.simulation.protanopia): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the protanopia simulation option.
+accessibility.simulation.protanopia=Protanopia (no red)
+
+# LOCALIZATION NOTE (accessibility.simulation.deuteranopia): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the deuteranopia simulation option.
+accessibility.simulation.deuteranopia=Deuteranopia (no green)
+
+# LOCALIZATION NOTE (accessibility.simulation.tritanopia): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the tritanopia simulation option.
+accessibility.simulation.tritanopia=Tritanopia (no blue)
+
+# LOCALIZATION NOTE (accessibility.simulation.tritanomaly): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the tritanomaly simulation option.
+accessibility.simulation.tritanomaly=Tritanomaly (low blue)
+
+# LOCALIZATION NOTE (accessibility.simulation.contrastLoss): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the contrast loss simulation option.
+# It is also shown in the simulation menu button in the accessibility panel and represent the
+# contrast loss simulation option currently selected.
+accessibility.simulation.contrastLoss=Contrast loss
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/application.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/application.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/application.ftl	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/application.ftl	2019-09-15 11:35:05.000000000 +0000
@@ -69,3 +69,40 @@
 # Suggestion to go to about:debugging in order to see Service Workers for all domains.
 # Clicking on the link will open about:debugging in a new tab.
 serviceworker-empty-suggestions-aboutdebugging = Inspect Service Workers from other domains. <a>Open about:debugging</a>
+# Header for the Manifest page when we have an actual manifest
+manifest-view-header = App Manifest
+# Header for the Manifest page when there's no manifest to inspect
+# The link will open https://developer.mozilla.org/en-US/docs/Web/Manifest
+manifest-empty-intro = You need to add a web app Manifest to inspect it here. <a>Learn more</a>
+# Header for the Errors and Warnings section of Manifest inspection displayed in the application panel.
+manifest-item-warnings = Errors and Warnings
+# Header for the Identity section of Manifest inspection displayed in the application panel.
+manifest-item-identity = Identity
+# Header for the Presentation section of Manifest inspection displayed in the application panel.
+manifest-item-presentation = Presentation
+# Header for the Icon section of Manifest inspection displayed in the application panel.
+manifest-item-icons = Icons
+# Text displayed while we are loading the manifest file
+manifest-loading = Loading manifest…
+# Text displayed when the manifest has been successfully loaded
+manifest-loaded-ok = Manifest loaded.
+# Text displayed when there has been an error while trying to load the manifest
+manifest-loaded-error = There was an error while loading the manifest:
+# Text displayed when the page has no manifest available
+manifest-non-existing = No manifest found to inspect.
+# Sidebar navigation item for Manifest sidebar item section
+sidebar-item-manifest = Manifest
+    .alt = Manifest Icon
+    .title = Manifest
+# Sidebar navigation item for Service Workers sidebar item section
+sidebar-item-service-workers = Service Workers
+    .alt = Service Workers Icon
+    .title = Service Workers
+# Text for the ALT and TITLE attributes of the warning icon
+icon-warning =
+    .alt = Warning icon
+    .title = Warning
+# Text for the ALT and TITLE attributes of the error icon
+icon-error =
+    .alt = Error icon
+    .title = Error
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/components.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/components.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/components.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/components.properties	2019-09-15 11:35:05.000000000 +0000
@@ -9,11 +9,16 @@
 # a frame, we use this string instead.
 frame.unknownSource=(dianav)
 
-# LOCALIZATION NOTE (viewsourceindebugger): The label for the tooltip when hovering over
+# LOCALIZATION NOTE (frame.viewsourceindebugger): The label for the tooltip when hovering over
 # a source link that links to the debugger.
 # %S represents the URL to match in the debugger.
 frame.viewsourceindebugger=View source in Debugger → %S
 
+# LOCALIZATION NOTE (frame.viewsourceinstyleeditor): The label for the tooltip when hovering over
+# a source link that links to the Style Editor.
+# %S represents the URL to match in the style editor.
+frame.viewsourceinstyleeditor=View source in Style Editor → %S
+
 # LOCALIZATION NOTE (notificationBox.closeTooltip): The content of a tooltip that
 # appears when hovering over the close button in a notification box.
 notificationBox.closeTooltip=Close this message
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/debugger.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/debugger.properties	2019-09-15 11:35:05.000000000 +0000
@@ -26,6 +26,9 @@
 # LOCALIZATION NOTE (copySource.label): This is the text that appears in the
 # context menu to copy the selected source of file open.
 copySource=Copy
+
+# LOCALIZATION NOTE (copySource.label): This is the text that appears in the
+# context menu to copy the selected source of file open.
 copySource.label=Copy source text
 copySource.accesskey=y
 
@@ -157,6 +160,10 @@
 # header.
 eventListenersHeader=Event Listeners
 
+# LOCALIZATION NOTE (eventListenersHeader1): The text to display in the events
+# header.
+eventListenersHeader1=Event Listener Breakpoints
+
 # LOCALIZATION NOTE (noStackFramesText): The text to display in the call stack tab
 # when there are no stack frames.
 noStackFramesText=No stack frames to display
@@ -211,6 +218,38 @@
 # source.
 blackboxCheckboxTooltip2=Toggle blackboxing
 
+# LOCALIZATION NOTE (noDomMutationBreakpoints): The text to
+# display in the DOM Mutation Breakpoints pane when there are no events.
+# %S will be replaced by an active link using inspectorTool as text
+noDomMutationBreakpoints=Right click an element in the %S and select “Break on…” to add a breakpoint
+
+# LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
+inspectorTool=Inspector
+
+# LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
+# the event search input bar
+eventListenersHeader1.placeholder=Filter by event type
+
+# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
+# DOM Mutation Breakpoints pane when there are no events.
+noDomMutationBreakpointsText=No breakpoints to display.
+
+# LOCALIZATION NOTE (domMutationHeader): The text to display in the
+# DOM Mutation Breakpoints header
+domMutationHeader=DOM Mutation Breakpoints
+
+# LOCALIZATION NOTE (domMutationTypes.attribute): The text to display in the
+# DOM Mutation Breakpoints panel for an attribute change
+domMutationTypes.attribute=Attribute Modification
+
+# LOCALIZATION NOTE (domMutationTypes.removal): The text to display in the
+# DOM Mutation Breakpoints panel for a DOM node removal
+domMutationTypes.removal=Node Removal
+
+# LOCALIZATION NOTE (domMutationTypes.subtree): The text to display in the
+# DOM Mutation Breakpoints panel for a DOM subtree change
+domMutationTypes.subtree=Subtree Modification
+
 # LOCALIZATION NOTE (sources.search.key2): Key shortcut to open the search for
 # searching all the source files the debugger has seen.
 # Do not localize "CmdOrCtrl+P", or change the format of the string. These are
@@ -317,6 +356,10 @@
 # key identifiers, not messages displayed to the user.
 sourceSearch.search.againPrev.key2=CmdOrCtrl+Shift+G
 
+# LOCALIZATION NOTE (sourceSearch.resultsSummary1): Shows a summary of
+# the number of matches for autocomplete
+sourceSearch.resultsSummary1=%d results
+
 # LOCALIZATION NOTE (sourceSearch.search.again.key3): Key shortcut to highlight
 # the next occurrence of the last search triggered from a source search
 # Do not localize "Cmd+G", or change the format of the string. These are
@@ -329,9 +372,10 @@
 # key identifiers, not messages displayed to the user.
 sourceSearch.search.againPrev.key3=Cmd+Shift+G
 
-# LOCALIZATION NOTE (sourceSearch.resultsSummary1): Shows a summary of
-# the number of matches for autocomplete
-sourceSearch.resultsSummary1=%d results
+# LOCALIZATION NOTE (sourceSearch.resultsSummary2): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# Shows a summary of the number of matches for autocomplete
+sourceSearch.resultsSummary2=#1 result;#1 results;#1 results;#1 results;#1 results
 
 # LOCALIZATION NOTE (noMatchingStringsText): The text to display in the
 # global search results when there are no matching strings after filtering.
@@ -389,12 +433,17 @@
 # LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
 # are displayed in the breakpoints menu item popup.
 breakpointMenuItem.setConditional=Configure conditional breakpoint
+
+# LOCALIZATION NOTE (breakpointMenuItem): The text for all the elements that
+# are displayed in the breakpoints menu item popup.
 breakpointMenuItem.enableSelf2.label=Enable
 breakpointMenuItem.enableSelf2.accesskey=E
 breakpointMenuItem.disableSelf2.label=Disable
 breakpointMenuItem.disableSelf2.accesskey=D
 breakpointMenuItem.deleteSelf2.label=Remove
 breakpointMenuItem.deleteSelf2.accesskey=R
+breakpointMenuItem.disabledbg.label=Never pause here
+breakpointMenuItem.enabledbg.label=Pause here
 breakpointMenuItem.enableOthers2.label=Enable others
 breakpointMenuItem.enableOthers2.accesskey=o
 breakpointMenuItem.disableOthers2.label=Disable others
@@ -498,6 +547,11 @@
 # for the summarizing the selected search result. e.g. 5 of 10 results.
 editor.searchResults=%d of %d results
 
+# LOCALIZATION NOTE (editor.searchResults1): Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# Editor Search bar message to summarize the selected search result. e.g. 5 of 10 results.
+editor.searchResults1=%d of #1 result;%d of #1 results;%d of #1 results;%d of #1 results;%d of #1 results
+
 # LOCALIZATION NOTE (editor.singleResult): Copy shown when there is one result.
 editor.singleResult=1 result
 
@@ -571,14 +625,6 @@
 editor.removeLogPoint.label=Remove log
 editor.removeLogPoint.accesskey=V
 
-# LOCALIZATION NOTE (editor.conditionalPanel.placeholder): Placeholder text for
-# input element inside ConditionalPanel component
-editor.conditionalPanel.placeholder=This breakpoint will pause when the expression is true
-
-# LOCALIZATION NOTE (editor.conditionalPanel.logPoint.placeholder): Placeholder text for
-# input element inside ConditionalPanel component when a log point is set
-editor.conditionalPanel.logPoint.placeholder=This breakpoint will log the result of the expression
-
 # LOCALIZATION NOTE (editor.conditionalPanel.placeholder2): Placeholder text for
 # input element inside ConditionalPanel component
 editor.conditionalPanel.placeholder2=Breakpoint condition, e.g. items.length > 0
@@ -601,6 +647,14 @@
 downloadFile.label=Download file
 downloadFile.accesskey=d
 
+# LOCALIZATION NOTE (inlinePreview.show.label): Context menu item
+# for showing the inline preview blocks
+inlinePreview.show.label=Show inline preview
+
+# LOCALIZATION NOTE (inlinePreview.hide.label): Context menu item
+# for hiding the inline preview block
+inlinePreview.hide.label=Hide inline preview
+
 # LOCALIZATION NOTE (framework.disableGrouping): This is the text that appears in the
 # context menu to disable framework grouping.
 framework.disableGrouping=Disable framework grouping
@@ -682,6 +736,16 @@
 sourceFooter.unblackbox=Unblackbox source
 sourceFooter.unblackbox.accesskey=b
 
+# LOCALIZATION NOTE (blackboxContextItem.blackbox): Text associated
+# with the blackbox context menu item
+blackboxContextItem.blackbox=Blackbox source
+blackboxContextItem.blackbox.accesskey=B
+
+# LOCALIZATION NOTE (blackboxContextItem.unblackbox): Text associated
+# with the unblackbox context menu item
+blackboxContextItem.unblackbox=Unblackbox source
+blackboxContextItem.unblackbox.accesskey=U
+
 # LOCALIZATION NOTE (sourceFooter.mappedSource): Text associated
 # with a mapped source. %S is replaced by the source map origin.
 sourceFooter.mappedSource=(From %S)
@@ -867,70 +931,6 @@
 # the global scope.
 globalScopeLabel=Global
 
-# LOCALIZATION NOTE (variablesViewErrorStacktrace): This is the text that is
-# shown before the stack trace in an error.
-variablesViewErrorStacktrace=Stack trace:
-
-# LOCALIZATION NOTE (variablesViewMoreObjects): the text that is displayed
-# when you have an object preview that does not show all of the elements. At the end of the list
-# you see "N more..." in the web console output.
-# This is a semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 number of remaining items in the object
-# example: 3 more…
-variablesViewMoreObjects=#1 more…;#1 more…;#1 more…;#1 more…;#1 more…
-
-# LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
-# in the variables list on an item with an editable name.
-variablesEditableNameTooltip=Double click to edit
-
-# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
-# in the variables list on an item with an editable value.
-variablesEditableValueTooltip=Click to change value
-
-# LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed
-# in the variables list on an item which can be removed.
-variablesCloseButtonTooltip=Click to remove
-
-# LOCALIZATION NOTE (variablesEditButtonTooltip): The text that is displayed
-# in the variables list on a getter or setter which can be edited.
-variablesEditButtonTooltip=Click to set value
-
-# LOCALIZATION NOTE (variablesDomNodeValueTooltip): The text that is displayed
-# in a tooltip on the "open in inspector" button in the the variables list for a
-# DOMNode item.
-variablesDomNodeValueTooltip=Click to select the node in the inspector
-
-# LOCALIZATION NOTE (configurable|...|Tooltip): The text that is displayed
-# in the variables list on certain variables or properties as tooltips.
-# Explanations of what these represent can be found at the following links:
-# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
-# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isExtensible
-# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isFrozen
-# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isSealed
-# It's probably best to keep these in English.
-configurableTooltip=configurable
-enumerableTooltip=enumerable
-writableTooltip=writable
-frozenTooltip=frozen
-sealedTooltip=sealed
-extensibleTooltip=extensible
-overriddenTooltip=overridden
-WebIDLTooltip=WebIDL
-
-# LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
-# in the variables list as a separator between the name and value.
-variablesSeparatorLabel=:
-
-# LOCALIZATION NOTE (watchExpressionsSeparatorLabel2): The text that is displayed
-# in the watch expressions list as a separator between the code and evaluation.
-watchExpressionsSeparatorLabel2=\u0020→
-
-# LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed
-# in the functions search panel as a separator between function's inferred name
-# and its real name (if available).
-functionSearchSeparatorLabel=←
-
 # LOCALIZATION NOTE(gotoLineModal.placeholder): The placeholder
 # text displayed when the user searches for specific lines in a file
 gotoLineModal.placeholder=Go to line…
@@ -990,12 +990,6 @@
 # resumed first.
 resumptionOrderPanelTitle=There are one or more paused debuggers. Please resume the most-recently paused debugger first at: %S
 
-variablesViewOptimizedOut=(optimized away)
-variablesViewUninitialized=(uninitialized)
-variablesViewMissingArgs=(unavailable)
-
-anonymousSourcesLabel=Anonymous Sources
-
 experimental=This is an experimental feature
 
 # LOCALIZATION NOTE (whyPaused.debuggerStatement): The text that is displayed
@@ -1007,10 +1001,30 @@
 # in a info block explaining how the debugger is currently paused on a breakpoint
 whyPaused.breakpoint=Paused on breakpoint
 
+# LOCALIZATION NOTE (whyPaused.eventBreakpoint): The text that is displayed
+# in a info block explaining how the debugger is currently paused on an event
+# breakpoint.
+whyPaused.eventBreakpoint=Paused on event breakpoint
+
 # LOCALIZATION NOTE (whyPaused.exception): The text that is displayed
 # in a info block explaining how the debugger is currently paused on an exception
 whyPaused.exception=Paused on exception
 
+# LOCALIZATION NOTE (whyPaused.mutationBreakpoint): The text that is displayed
+# in a info block explaining how the debugger is currently paused on a
+# DOM mutation breakpoint
+whyPaused.mutationBreakpoint=Paused on DOM mutation
+
+# LOCALIZATION NOTE (whyPaused.interrupted): The text that is displayed
+# in a info block explaining how the debugger is currently paused at
+# a JS execution
+whyPaused.interrupted=Paused at Execution
+
+# LOCALIZATION NOTE (whyPaused.replayForcedPause): The text that is displayed
+# in a info block explaining how the debugger is currently paused in a
+# recording.
+whyPaused.replayForcedPause=Paused in Recording
+
 # LOCALIZATION NOTE (whyPaused.resumeLimit): The text that is displayed
 # in a info block explaining how the debugger is currently paused while stepping
 # in or out of the stack
@@ -1127,3 +1141,74 @@
 # LOCALIZATION NOTE (shortcuts.buttonName): text describing
 # keyboard shortcut button text
 shortcuts.buttonName=Keyboard shortcuts
+
+# LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
+# in the variables list as a separator between the name and value.
+variablesSeparatorLabel=:
+
+# LOCALIZATION NOTE (watchExpressionsSeparatorLabel2): The text that is displayed
+# in the watch expressions list as a separator between the code and evaluation.
+watchExpressionsSeparatorLabel2=\u0020→
+
+# LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed
+# in the functions search panel as a separator between function's inferred name
+# and its real name (if available).
+functionSearchSeparatorLabel=←
+
+variablesViewOptimizedOut=(optimized away)
+variablesViewUninitialized=(uninitialized)
+variablesViewMissingArgs=(unavailable)
+
+anonymousSourcesLabel=Anonymous Sources
+
+# LOCALIZATION NOTE (variablesDomNodeValueTooltip): The text that is displayed
+# in a tooltip on the "open in inspector" button in the the variables list for a
+# DOMNode item.
+variablesDomNodeValueTooltip=Click to select the node in the inspector
+
+# LOCALIZATION NOTE (variablesEditButtonTooltip): The text that is displayed
+# in the variables list on a getter or setter which can be edited.
+variablesEditButtonTooltip=Click to set value
+
+# LOCALIZATION NOTE (variablesViewErrorStacktrace): This is the text that is
+# shown before the stack trace in an error.
+variablesViewErrorStacktrace=Stack trace:
+
+# LOCALIZATION NOTE (variablesViewMoreObjects): the text that is displayed
+# when you have an object preview that does not show all of the elements. At the end of the list
+# you see "N more..." in the web console output.
+# This is a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of remaining items in the object
+# example: 3 more…
+variablesViewMoreObjects=#1 more…;#1 more…;#1 more…;#1 more…;#1 more…
+
+# LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
+# in the variables list on an item with an editable name.
+variablesEditableNameTooltip=Double click to edit
+
+# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
+# in the variables list on an item with an editable value.
+variablesEditableValueTooltip=Click to change value
+
+# LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed
+# in the variables list on an item which can be removed.
+variablesCloseButtonTooltip=Click to remove
+
+# LOCALIZATION NOTE (configurable|...|Tooltip): The text that is displayed
+# in the variables list on certain variables or properties as tooltips.
+# Explanations of what these represent can be found at the following links:
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isExtensible
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isFrozen
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isSealed
+# It's probably best to keep these in English.
+configurableTooltip=configurable
+enumerableTooltip=enumerable
+writableTooltip=writable
+frozenTooltip=frozen
+sealedTooltip=sealed
+extensibleTooltip=extensible
+overriddenTooltip=overridden
+WebIDLTooltip=WebIDL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/inspector.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/inspector.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/inspector.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/inspector.properties	2019-09-15 11:35:05.000000000 +0000
@@ -54,6 +54,26 @@
 # the markup view.
 markupView.display.inlineGrid.tooltiptext=This element behaves like an inline element and lays out its content according to the grid model.
 
+# LOCALIZATION NOTE (markupView.display.flex.tooltiptext2)
+# Used in a tooltip that appears when the user hovers over the display type button in
+# the markup view.
+markupView.display.flex.tooltiptext2=This element behaves like a block element and lays out its content according to the flexbox model. Click to toggle the flexbox overlay for this element.
+
+# LOCALIZATION NOTE (markupView.display.inlineFlex.tooltiptext2)
+# Used in a tooltip that appears when the user hovers over the display type button in
+# the markup view.
+markupView.display.inlineFlex.tooltiptext2=This element behaves like an inline element and lays out its content according to the flexbox model. Click to toggle the flexbox overlay for this element.
+
+# LOCALIZATION NOTE (markupView.display.grid.tooltiptext2)
+# Used in a tooltip that appears when the user hovers over the display type button in
+# the markup view.
+markupView.display.grid.tooltiptext2=This element behaves like a block element and lays out its content according to the grid model. Click to toggle the grid overlay for this element.
+
+# LOCALIZATION NOTE (markupView.display.inlineGrid.tooltiptext2)
+# Used in a tooltip that appears when the user hovers over the display type button in
+# the markup view.
+markupView.display.inlineGrid.tooltiptext2=This element behaves like an inline element and lays out its content according to the grid model. Click to toggle the grid overlay for this element.
+
 # LOCALIZATION NOTE (markupView.display.subgrid.tooltiptext)
 # Used in a tooltip that appears when the user hovers over the display type button in
 # the markup view.
@@ -290,6 +310,29 @@
 inspectorAddAttribute.label=Add Attribute
 inspectorAddAttribute.accesskey=A
 
+# LOCALIZATION NOTE (inspectorPseudoClassSubmenu.label): This is the label
+# shown in the inspector contextual-menu for the sub-menu of the pseudo-classes.
+inspectorPseudoClassSubmenu.label=Change Pseudo-class
+
+# LOCALIZATION NOTE (inspectorBreakpointSubmenu.label): This is the label
+# shown in the inspector contextual-menu for the sub-menu of the DOM breakpoints.
+inspectorBreakpointSubmenu.label=Break on…
+
+# LOCALIZATION NOTE (inspectorSubtreeModification.label): This is the label shown
+# in the inspector contextual-menu for the item that lets users add a DOM breakpoint
+# for subtree modification.
+inspectorSubtreeModification.label=Subtree Modification
+
+# LOCALIZATION NOTE (inspectorAttributeModification.label): This is the label shown
+# in the inspector contextual-menu for the item that lets users add a DOM breakpoint
+# for attribute modification.
+inspectorAttributeModification.label=Attribute Modification
+
+# LOCALIZATION NOTE (inspectorNodeRemoval.label): This is the label shown
+# in the inspector contextual-menu for the item that lets users add a DOM breakpoint
+# for node removal.
+inspectorNodeRemoval.label=Node Removal
+
 # LOCALIZATION NOTE (inspectorSearchHTML.label3): This is the label that is
 # shown as the placeholder for the markup view search in the inspector.
 inspectorSearchHTML.label3=Search HTML
@@ -472,14 +515,6 @@
 # displayed.
 inspector.noProperties=No CSS properties found.
 
-# LOCALIZATION NOTE (markupView.scrollable.badge): This is the text displayed inside a
-# badge, in the inspector, next to nodes that are scrollable in the page.
-markupView.scrollable.badge=scrollable
-
-# LOCALIZATION NOTE (markupView.scrollable.tooltip): This is the tooltip that is displayed
-# when hovering over badges next to scrollable elements in the inspector.
-markupView.scrollable.tooltip=This element has scrollbars.
-
 # LOCALIZATION NOTE (inspector.printSimulation.tooltip):
 # This is the tooltip of the print simulation button in the Rule View toolbar
 # that toggles print simulation.
@@ -496,3 +531,36 @@
 # LOCALIZATION NOTE (rulePreviewTooltip.noAssociatedRule): This is the text displayed inside
 # the RulePreviewTooltip when a rule cannot be found for a CSS property declaration.
 rulePreviewTooltip.noAssociatedRule=No associated rule
+
+# LOCALIZATION NOTE (colorPickerTooltip.contrastAgainstBgTitle): A title text for the
+# contrast ratio value description that labels the background the color contrast ratio is calculated
+# against, used together with the actual background color. %S in the content will be replaced by a
+# span (containing bg color swatch) and textNode (containing bg color hex string) at run time
+colorPickerTooltip.contrastAgainstBgTitle=Calculated against background: %S
+
+# LOCALIZATION NOTE (colorPickerTooltip.spectrumDraggerTitle): A title text for the
+# spectrum dragger panel in the color picker tooltip.
+colorPickerTooltip.spectrumDraggerTitle=Spectrum
+
+# LOCALIZATION NOTE (colorPickerTooltip.eyedropperTitle): A title text for the
+# eyedropper in the color picker tooltip.
+colorPickerTooltip.eyedropperTitle=Pick color on page
+
+# LOCALIZATION NOTE (colorPickerTooltip.colorNameTitle): A title text for the
+# closest color name shown in the color picker tooltip, used together with the actual color.
+# %S in the content will be replaced by the color name the current color is closest to.
+colorPickerTooltip.colorNameTitle=Closest to: %S
+
+# LOCALIZATION NOTE (colorPickerTooltip.hueSliderTitle): A title text for the
+# hue slider in the color picker tooltip.
+colorPickerTooltip.hueSliderTitle=Hue
+
+# LOCALIZATION NOTE (colorPickerTooltip.alphaSliderTitle): A title text for the
+# alpha slider in the color picker tooltip.
+colorPickerTooltip.alphaSliderTitle=Opacity
+
+# LOCALIZATION NOTE (colorPickerTooltip.contrast.large.title): A title text for the color
+# contrast ratio description in the color picker tooltip, used together with the specification
+# that the color contrast criteria used is for large text. %S in the content will be replaced by a
+# large text indicator span at run time.
+colorPickerTooltip.contrast.large.title=Contrast %S:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/netmonitor.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/netmonitor.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/netmonitor.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/netmonitor.properties	2019-09-15 11:35:05.000000000 +0000
@@ -66,6 +66,14 @@
 # headers tab of the network details pane for the filtering input.
 headersFilterText=Filter headers
 
+# LOCALIZATION NOTE (webSocketsEmptyText): This is the text displayed in the
+# WebSockets tab of the network details pane when there are no frames available.
+webSocketsEmptyText=No WebSocket frames for this request
+
+# LOCALIZATION NOTE (messagesEmptyText): This is the text displayed in the
+# WebSockets tab of the network details pane when there are no frames available.
+messagesEmptyText=No messages for this request
+
 # LOCALIZATION NOTE (cookiesEmptyText): This is the text displayed in the
 # cookies tab of the network details pane when there are no cookies available.
 cookiesEmptyText=No cookies for this request
@@ -193,7 +201,7 @@
 networkMenu.summary.transferred=%S / %S transferred
 
 # LOCALIZATION NOTE (networkMenu.summary.tooltip.transferred): A tooltip explaining
-# what the transferred  label displays
+# what the transferred label displays
 networkMenu.summary.tooltip.transferred=Size/transferred size of all requests
 
 # LOCALIZATION NOTE (networkMenu.summary.finish): This label is displayed
@@ -204,6 +212,27 @@
 # what the finish label displays
 networkMenu.summary.tooltip.finish=Total time needed to load all requests
 
+# LOCALIZATION NOTE (networkMenu.ws.summary.framesCount2): This label is displayed
+# in the messages table footer providing the number of frames
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+networkMenu.ws.summary.framesCount2=#1 message;#1 messages;#1 messages;#1 messages;#1 messages
+
+# LOCALIZATION NOTE (networkMenu.ws.summary.framesCountEmpty): This label is displayed
+# in the messages table footer when there are no frames
+networkMenu.ws.summary.framesCountEmpty=No messages
+
+# LOCALIZATION NOTE (networkMenu.ws.summary.tooltip.framesCount): A tooltip explaining
+# what the framesCount label displays
+networkMenu.ws.summary.tooltip.framesCount=Number of messages
+
+# LOCALIZATION NOTE (networkMenu.ws.summary.tooltip.framesTotalSize): A tooltip explaining
+# what the framesTotalSize label displays
+networkMenu.ws.summary.tooltip.framesTotalSize=Total size of displayed messages
+
+# LOCALIZATION NOTE (networkMenu.ws.summary.tooltip.framesTotalTime): A tooltip explaining
+# what framesTotalTime displays
+networkMenu.ws.summary.tooltip.framesTotalTime=Total elapsed time between the first and last displayed messages
+
 # LOCALIZATION NOTE (networkMenu.sizeB): This is the label displayed
 # in the network menu specifying the size of a request (in bytes).
 networkMenu.sizeB=%S B
@@ -633,10 +662,187 @@
 # in the network table toolbar, above the "waterfall" column.
 netmonitor.toolbar.waterfall=Timeline
 
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.frameType): This is the label displayed
+# in the websocket frame table header, above the "type" column.
+netmonitor.ws.toolbar.frameType=Type
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.size): This is the label displayed
+# in the websocket frame table header, above the "size" column.
+netmonitor.ws.toolbar.size=Size
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.payload): This is the label displayed
+# in the websocket frame table header, above the "payload" column.
+netmonitor.ws.toolbar.payload=Payload
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.data): This is the label displayed
+# in the websocket frame table header, above the "data" column.
+netmonitor.ws.toolbar.data=Data
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.opCode): This is the label displayed
+# in the websocket frame table header, above the "opCode" column.
+netmonitor.ws.toolbar.opCode=OpCode
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.maskBit): This is the label displayed
+# in the websocket frame table header, above the "maskBit" column.
+netmonitor.ws.toolbar.maskBit=MaskBit
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.finBit): This is the label displayed
+# in the websocket frame table header, above the "finBit" column.
+netmonitor.ws.toolbar.finBit=FinBit
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.time): This is the label displayed
+# in the websocket frame table header, above the "time" column.
+netmonitor.ws.toolbar.time=Time
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.clear): This is the label displayed
+# in the websocket toolbar for the "Clear" button.
+netmonitor.ws.toolbar.clear=Clear
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.filterFreetext.label): This is the label
+# displayed in the websocket toolbar for the frames filtering textbox.
+netmonitor.ws.toolbar.filterFreetext.label=Filter Messages
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.filterFreetext.key): This is the
+# shortcut key to focus on the websocket toolbar frames filtering textbox
+netmonitor.ws.toolbar.filterFreetext.key=CmdOrCtrl+E
+
+# LOCALIZATION NOTE (netmonitor.ws.toolbar.resetColumns): This is the label
+# displayed in the messages panel table header context menu.
+netmonitor.ws.toolbar.resetColumns=Reset Columns
+
+# LOCALIZATION NOTE (netmonitor.ws.context.all): This is the label displayed
+# on the context menu that shows "All" WebSocket frames.
+netmonitor.ws.context.all=All
+
+# LOCALIZATION NOTE (netmonitor.ws.context.all.accesskey): This is the access key
+# for the "All" menu item displayed in the context menu in the websocket toolbar.
+netmonitor.ws.context.all.accesskey=A
+
+# LOCALIZATION NOTE (netmonitor.ws.context.sent): This is the label displayed
+# on the context menu that shows "Sent" WebSocket frames.
+netmonitor.ws.context.sent=Sent
+
+# LOCALIZATION NOTE (netmonitor.ws.context.sent.accesskey): This is the access key
+# for the "Sent" menu item displayed in the context menu in the websocket toolbar.
+netmonitor.ws.context.sent.accesskey=S
+
+# LOCALIZATION NOTE (netmonitor.ws.context.received): This is the label displayed
+# on the context menu that shows "Received" WebSocket frames.
+netmonitor.ws.context.received=Received
+
+# LOCALIZATION NOTE (netmonitor.ws.context.received.accesskey): This is the access key
+# for the "Received" menu item displayed in the context menu in the websocket toolbar.
+netmonitor.ws.context.received.accesskey=R
+
+# LOCALIZATION NOTE (netmonitor.ws.context.copyFrame): This is the label displayed
+# on the context menu that shows "Copy Message".
+netmonitor.ws.context.copyFrame=Copy Message
+
+# LOCALIZATION NOTE (netmonitor.ws.context.copyFrame.accesskey): This is the access key
+# for the "Copy Message" menu item displayed in the context menu of a WebSocket frame.
+netmonitor.ws.context.copyFrame.accesskey=C
+
+# LOCALIZATION NOTE (netmonitor.ws.type.sent): This is the label used as
+# accessible text for the "sent" type icon in the websocket table's "data" column.
+netmonitor.ws.type.sent=Sent
+
+# LOCALIZATION NOTE (netmonitor.ws.type.received): This is the label used as
+# accessible text for the "received" type icon in the websocket table's "data" column.
+netmonitor.ws.type.received=Received
+
+# LOCALIZATION NOTE (netmonitor.ws.time.format): This is the format used for the
+# time values in the websocket table's "time" column
+# %1$S is the formatted hour-minutes-seconds, %2$S is the milliseconds (zero-padded)
+netmonitor.ws.time.format=%1$S.%2$S
+
+# LOCALIZATION NOTE (netmonitor.ws.rawData.header): This is the label displayed
+# in the messages panel identifying the raw data.
+netmonitor.ws.rawData.header=Raw Data (%S)
+
+# LOCALIZATION NOTE (netmonitor.search.toolbar.inputPlaceholder): This is the label
+# displayed in the search toolbar for the search input as the placeholder.
+netmonitor.search.toolbar.inputPlaceholder=Find in resources…
+
+# LOCALIZATION NOTE (netmonitor.search.toolbar.close): This is the label
+# displayed in the search toolbar to close the search panel.
+netmonitor.search.toolbar.close=Close Search Panel
+
+# LOCALIZATION NOTE (netmonitor.search.toolbar.clear): This is the label
+# displayed in the search toolbar to clear the search panel.
+netmonitor.search.toolbar.clear=Clear Search Results
+
+# LOCALIZATION NOTE (netmonitor.search.toolbar.caseSensitive): This is the label
+# displayed in the search toolbar to do a case sensitive search.
+netmonitor.search.toolbar.caseSensitive=Case Sensitive
+
+# LOCALIZATION NOTE (netmonitor.search.labels.responseHeaders): This is the label
+# displayed in the search results as the label for the response headers
+netmonitor.search.labels.responseHeaders=Response Header
+
+# LOCALIZATION NOTE (netmonitor.search.labels.requestHeaders): This is the label
+# displayed in the search results as the label for the request headers
+netmonitor.search.labels.requestHeaders=Request Header
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.fetching): This is the label
+# displayed in the search results status bar when status is set to fetching.
+netmonitor.search.status.labels.fetching=Searching…
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.canceled): This is the label
+# displayed in the search results status bar when status is set to cancelled.
+netmonitor.search.status.labels.canceled=Search canceled.
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.done): This is the label
+# displayed in the search results status bar when status is set to done.
+# %1$S is the number of matching lines in search results (netmonitor.search.status.labels.matchingLines)
+# %2$S is the number of files in which matching lines were found (netmonitor.search.status.labels.fileCount)
+netmonitor.search.status.labels.done=Search finished. %1$S %2$S.
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.matchingLines): Semi-colon list of plural forms.
+# This is the label displayed in the search results status bar showing matching lines found.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of matching lines found
+netmonitor.search.status.labels.matchingLines=Found #1 matching line;Found #1 matching lines;Found #1 matching lines;Found #1 matching lines;Found #1 matching lines
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.fileCount): Semi-colon list of plural forms.
+# This is the label displayed in the search results status bar showing file count
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of files in which matching lines were found
+netmonitor.search.status.labels.fileCount=in #1 file;in #1 files;in #1 files;in #1 files;in #1 files
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.error): This is the label
+# displayed in the search results status bar when status is set to error.
+netmonitor.search.status.labels.error=Search error.
+
+# LOCALIZATION NOTE (messagesTruncated): This is the text displayed
+# in the messages panel when the number of messages is over the
+# truncation limit.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+netmonitor.ws.truncated-messages.warning=#1 message has been truncated to conserve memory;#1 messages have been truncated to conserve memory;#1 messages have been truncated to conserve memory;#1 messages have been truncated to conserve memory;#1 messages have been truncated to conserve memory
+
+# LOCALIZATION NOTE (disableMessagesTruncation): This is the text displayed
+# in the messages panel checkbox label for toggling message truncation.
+toggleMessagesTruncation=Keep all future messages
+
+# LOCALIZATION NOTE (toggleMessagesTruncation.title): This is the title used
+# to describe the checkbox used to toggle message truncation.
+toggleMessagesTruncation.title=Keep all future messages or continue showing truncated messages
+
+# LOCALIZATION NOTE (messageDataTruncated): This is the text displayed
+# to describe to describe data truncation in the messages panel.
+messageDataTruncated=Data has been truncated
+
 # LOCALIZATION NOTE (netmonitor.tab.headers): This is the label displayed
 # in the network details pane identifying the headers tab.
 netmonitor.tab.headers=Headers
 
+# LOCALIZATION NOTE (netmonitor.tab.webSockets): This is the label displayed
+# in the network details pane identifying the webSockets tab.
+netmonitor.tab.webSockets=WebSockets
+
+# LOCALIZATION NOTE (netmonitor.tab.messages): This is the label displayed
+# in the network details pane identifying the messages tab.
+netmonitor.tab.messages=Messages
+
 # LOCALIZATION NOTE (netmonitor.tab.cookies): This is the label displayed
 # in the network details pane identifying the cookies tab.
 netmonitor.tab.cookies=Cookies
@@ -717,6 +923,10 @@
 # shortcut key to focus on the toolbar url filtering textbox
 netmonitor.toolbar.filterFreetext.key=CmdOrCtrl+F
 
+# LOCALIZATION NOTE (netmonitor.toolbar.search.key): This is the
+# shortcut key to toggle the search panel
+netmonitor.toolbar.search.key=CmdOrCtrl+Shift+F
+
 # LOCALIZATION NOTE (netmonitor.toolbar.filterFreetext.learnMore): This is
 # the title used for MDN icon in filtering textbox
 netmonitor.toolbar.filterFreetext.learnMore=Learn more about filtering
@@ -745,6 +955,10 @@
 # in the network toolbar for the toggle recording button.
 netmonitor.toolbar.toggleRecording=Pause/Resume recording network log
 
+# LOCALIZATION NOTE (netmonitor.toolbar.search): This is the tooltip label displayed
+# in the network toolbar for the search  button.
+netmonitor.toolbar.search=Search
+
 # LOCALIZATION NOTE (netmonitor.toolbar.perf): This is the label displayed
 # in the network toolbar for the performance analysis button.
 netmonitor.toolbar.perf=Toggle performance analysis…
@@ -977,6 +1191,15 @@
 # for the Copy as cURL menu item displayed in the context menu for a request
 netmonitor.context.copyAsCurl.accesskey=C
 
+# LOCALIZATION NOTE (netmonitor.context.copyAsCurl.*): This is the template used to add
+# a target platform to the label for "Copy as cURL" command
+# e.g. Copy as cURL (Windows)
+# Localized label for "Copy as cURL": %S
+netmonitor.context.copyAsCurl.win=%S (Windows)
+netmonitor.context.copyAsCurl.win.accesskey=C
+netmonitor.context.copyAsCurl.posix=%S (POSIX)
+netmonitor.context.copyAsCurl.posix.accesskey=P
+
 # LOCALIZATION NOTE (netmonitor.context.copyAsFetch): This is the label displayed
 # on the context menu that copies the selected request as a fetch request.
 netmonitor.context.copyAsFetch=Copy as Fetch
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/scratchpad.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/scratchpad.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/scratchpad.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/scratchpad.properties	2019-09-15 11:35:05.000000000 +0000
@@ -64,12 +64,12 @@
 # you try to revert unsaved content of scratchpad.
 confirmRevert.title=Revert Changes
 
-# LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
+# LOCALIZATION NOTE  (scratchpadIntro1): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
 scratchpadIntro1=/*\n * This is a JavaScript Scratchpad.\n *\n * Enter some JavaScript, then Right Click or choose from the Execute Menu:\n * 1. Run to evaluate the selected text (%1$S),\n * 2. Inspect to bring up an Object Inspector on the result (%2$S), or,\n * 3. Display to insert the result in a comment after the selection. (%3$S)\n */\n\n
 
-# LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
+# LOCALIZATION NOTE  (browserContext.notification): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=This scratchpad executes in the Browser context.
 
@@ -82,7 +82,7 @@
 # Scratchpad.
 scratchpad.statusBarLineCol  = Line %1$S, Col %2$S
 
-# LOCALIZATION NOTE (fileExists.notification): This is the message displayed
+# LOCALIZATION NOTE (fileNoLongerExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification=This file no longer exists.
 
@@ -99,7 +99,12 @@
 # %1 is the text of selfxss.okstring
 selfxss.msg=Scam Warning: Take care when pasting things you don’t understand. This could allow attackers to steal your identity or take control of your computer. Please type ‘%S’ in the scratchpad below to allow pasting.
 
-# LOCALIZATION NOTE (selfxss.msg): the string to be typed
+# LOCALIZATION NOTE (selfxss.okstring): the string to be typed
 # in by a new user of the developer tools when they receive the sefxss.msg prompt.
 # Please avoid using non-keyboard characters here
 selfxss.okstring=allow pasting
+
+# LOCALIZATION NOTE (scratchpad.deprecated.label): Text for the deprecation message
+# displayed when starting Scratchpad. 
+# This entire text is treated as a link to an MDN page.
+scratchpad.deprecated.label=Scratchpad will be disabled in a future release. Learn more…
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/startup.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/startup.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/startup.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/startup.properties	2019-09-15 11:35:05.000000000 +0000
@@ -70,17 +70,16 @@
 # This is used as the label for the toolbox panel.
 ToolboxDebugger.panelLabel=Debugger Panel
 
-# LOCALIZATION NOTE (ToolboxDebugger.tooltip2):
-# This string is displayed in the tooltip of the tab when the debugger is
-# displayed inside the developer tools window..
-# A keyboard shortcut for JS Debugger will be shown inside brackets.
-ToolboxDebugger.tooltip2=JavaScript Debugger (%S)
-
 # LOCALIZATION NOTE (ToolboxDebugger.tooltip3):
 # This string is displayed in the tooltip of the tab when the debugger is
 # displayed inside the developer tools window.
 ToolboxDebugger.tooltip3=JavaScript Debugger
 
+# LOCALIZATION NOTE (ToolboxDebugger.tooltip4):
+# This string is displayed in the tooltip of the tab when the debugger is
+# displayed inside the developer tools window.
+ToolboxDebugger.tooltip4=JavaScript Debugger (%S)
+
 # LOCALIZATION NOTE (debuggerMenu.accesskey)
 # Used for the menuitem in the tool menu
 debuggerMenu.accesskey=D
@@ -104,48 +103,6 @@
 # editor.
 open.accesskey=l
 
-# LOCALIZATION NOTE (ToolboxShaderEditor.label):
-# This string is displayed in the title of the tab when the Shader Editor is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxShaderEditor.label=Shader Editor
-
-# LOCALIZATION NOTE (ToolboxShaderEditor.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxShaderEditor.panelLabel=Shader Editor Panel
-
-# LOCALIZATION NOTE (ToolboxShaderEditor.tooltip):
-# This string is displayed in the tooltip of the tab when the Shader Editor is
-# displayed inside the developer tools window.
-ToolboxShaderEditor.tooltip=Live GLSL shader language editor for WebGL
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.label):
-# This string is displayed in the title of the tab when the Shader Editor is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxCanvasDebugger.label=Canvas
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxCanvasDebugger.panelLabel=Canvas Panel
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.tooltip):
-# This string is displayed in the tooltip of the tab when the Shader Editor is
-# displayed inside the developer tools window.
-ToolboxCanvasDebugger.tooltip=Tools to inspect and debug <canvas> contexts
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.label):
-# This string is displayed in the title of the tab when the Web Audio Editor
-# is displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxWebAudioEditor1.label=Web Audio
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxWebAudioEditor1.panelLabel=Web Audio Panel
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.tooltip):
-# This string is displayed in the tooltip of the tab when the Web Audio Editor is
-# displayed inside the developer tools window.
-ToolboxWebAudioEditor1.tooltip=Web Audio context visualizer and audio node inspector
-
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
 inspector.label=Inspector
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/storage.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/storage.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/storage.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/storage.properties	2019-09-15 11:35:05.000000000 +0000
@@ -32,6 +32,8 @@
 tree.labels.indexedDB=Indexed DB
 tree.labels.Cache=Cache Storage
 
+tree.labels.extensionStorage=Extension Storage
+
 # LOCALIZATION NOTE (table.headers.*.*):
 # These strings are the header names of the columns in the Storage Table for
 # each type of storage available through the Storage Tree to the side.
@@ -69,6 +71,10 @@
 table.headers.indexedDB.autoIncrement=Auto Increment
 table.headers.indexedDB.indexes=Indexes
 
+table.headers.extensionStorage.area=Storage Area
+table.headers.extensionStorage.name=Key
+table.headers.extensionStorage.value=Value
+
 # LOCALIZATION NOTE (label.expires.session):
 # This string is displayed in the expires column when the cookie is Session
 # Cookie
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/toolbox.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/toolbox.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/toolbox.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/toolbox.properties	2019-09-15 11:35:05.000000000 +0000
@@ -285,6 +285,22 @@
 # shown in the web replay timeline marker
 toolbox.replay.jumpMessage=Jump to message %1$S
 
+# LOCALIZATION NOTE (toolbox.replay.jumpMessage2): This is the label
+# shown in the web replay timeline marker
+toolbox.replay.jumpMessage2=Jump to %1$S
+
+# LOCALIZATION NOTE (toolbox.replay.resume): This is the text that appears in the
+# Replay command bar to prompt the user to resume the program.
+toolbox.replay.resume=Resume
+
+# LOCALIZATION NOTE (toolbox.replay.rewind): This is the text that appears in the
+# Replay command bar to prompt the user to rewind the program.
+toolbox.replay.rewind=Rewind
+
+# LOCALIZATION NOTE (toolbox.replay.pause): This is the text that appears in the
+# Replay command bar to prompt the user to pause the program.
+toolbox.replay.pause=Pause
+
 # LOCALIZATION NOTE (toolbox.debugTargetErrorPage.title): This is the title
 # for the Error view shown by the toolbox when a connection to a debug target
 # could not be made
@@ -294,3 +310,8 @@
 # text that appears in the Error view and explains to the user that an error
 # has happened while trying to connect to a debug target
 toolbox.debugTargetErrorPage.description = Cannot connect to the debug target. See error details below:
+
+# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the
+# settings panel for panel that will be removed in future releases.
+# This entire text is treated as a link to an MDN page.
+options.deprecationNotice=Deprecated. Learn More…
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/webconsole.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/webconsole.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/client/webconsole.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/client/webconsole.properties	2019-09-15 11:35:05.000000000 +0000
@@ -208,6 +208,22 @@
 # copies the entire output of the console to the clipboard.
 webconsole.menu.exportClipboard.label=Export visible messages to clipboard
 
+# LOCALIZATION NOTE (webconsole.menu.exportSubmenu.label)
+# Label used for a context-menu item displayed on the output. Clicking on it
+# opens a submenu where the user can select how to export messages.
+webconsole.menu.exportSubmenu.label=Export visible messages to
+
+# LOCALIZATION NOTE (webconsole.menu.exportClipboard.label)
+# Label used for a context-menu item displayed on the output. Clicking on it
+# copies the entire output of the console to the clipboard.
+webconsole.menu.exportSubmenu.exportCliboard.label=Clipboard
+
+# LOCALIZATION NOTE (webconsole.menu.exportFile.label)
+# Label used for a context-menu item displayed on the output. Clicking on it
+# opens a file picker to allow the user save a file containing
+# the output of the console.
+webconsole.menu.exportSubmenu.exportFile.label=File
+
 # LOCALIZATION NOTE (webconsole.menu.timeWarp.label)
 # Label used for a context-menu item displayed for any log. Clicking on it will
 # jump to the execution point where the log item was generated.
@@ -268,6 +284,11 @@
 # when there are CSS errors in the page.
 webconsole.cssFilterButton.label=CSS
 
+# LOCALIZATION NOTE (webconsole.cssFilterButton.inactive.tooltip)
+# Label used as the tooltip of the "CSS" button in the additional filter toolbar, when the
+# filter is inactive (=unchecked).
+webconsole.cssFilterButton.inactive.tooltip=Stylesheets will be reparsed to check for errors. Refresh the page to also see errors from stylesheets modified from Javascript.
+
 # LOCALIZATION NOTE (webconsole.xhrFilterButton.label)
 # Label used as the text of the "XHR" button in the additional filter toolbar.
 # It shows or hides messages displayed when the page makes an XMLHttpRequest or
@@ -385,6 +406,18 @@
 # and that we have several warning messages about resources being blocked.
 webconsole.group.contentBlocked=Content blocked messages
 
+# LOCALIZATION NOTE (webconsole.confirmDialog.getter.invokeButtonLabelWithShortcut)
+# Label used for the confirm button in the "invoke getter" dialog that appears in the
+# console when a user tries to autocomplete a property with a getter.
+# A keyboard shortcut will be shown inside the latter pair of brackets.
+webconsole.confirmDialog.getter.invokeButtonLabelWithShortcut=Invoke (%S)
+
+# LOCALIZATION NOTE (webconsole.confirmDialog.getter.closeButton.tooltip)
+# Label used as the tooltip for the close  button in the "invoke getter" dialog that
+# appears in the console when a user tries to autocomplete a property with a getter.
+# A keyboard shortcut will be shown inside the latter pair of brackets.
+webconsole.confirmDialog.getter.closeButton.tooltip=Close (%S)
+
 # LOCALIZATION NOTE (webconsole.cssWarningElements.label)
 # Label for the list of HTML elements matching the selector associated
 # with the CSS warning. Parameters: %S is the CSS selector.
@@ -398,4 +431,64 @@
 # LOCALIZATION NOTE (webconsole.message.componentDidCatch.copyButton.label)
 # Label displayed on the button next to the message we display when the webconsole
 # couldn't handle a given packet (See webconsole.message.componentDidCatch.label).
-webconsole.message.componentDidCatch.copyButton.label=Copy message metadata to clipboard
\ No newline at end of file
+webconsole.message.componentDidCatch.copyButton.label=Copy message metadata to clipboard
+
+
+# LOCALIZATION NOTE (webconsole.editor.toolbar.executeButton.label)
+# Label used for the text of the execute button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+webconsole.editor.toolbar.executeButton.label=Run
+
+# LOCALIZATION NOTE (webconsole.editor.toolbar.executeButton.tooltip)
+# Label used for the tooltip on the execute button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+# Parameters: %S is the keyboard shortcut.
+webconsole.editor.toolbar.executeButton.tooltip=Run expression (%S). This won’t clear the input.
+
+# LOCALIZATION NOTE (webconsole.editor.toolbar.executeButton.tooltip)
+# Label used for the tooltip on the history previous expression, in the editor toolbar,
+# which is displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+webconsole.editor.toolbar.history.prevExpressionButton.tooltip=Previous Expression
+
+
+# LOCALIZATION NOTE (webconsole.editor.toolbar.executeButton.tooltip)
+# Label used for the tooltip on the history next expression, in the editor toolbar,
+# which is displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+webconsole.editor.toolbar.history.nextExpressionButton.tooltip=Next Expression
+
+# LOCALIZATION NOTE (webconsole.editor.toolbar.closeButton.tooltip2)
+# Label used for the tooltip on the close button, in the editor toolbar, which is
+# displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
+# Parameters: %S is the keyboard shortcut.
+webconsole.editor.toolbar.closeButton.tooltip2=Switch back to inline mode (%S)
+
+# LOCALIZATION NOTE (webconsole.input.openEditorButton.tooltip2)
+# Label used for the tooltip on the open editor button, in console input, which is
+# displayed when the console is in regular mode.
+# Parameters: %S is the keyboard shortcut.
+webconsole.input.openEditorButton.tooltip2=Switch to multi-line editor mode (%S)
+
+# LOCALIZATION NOTE (webconsole.warningGroup.messageCount.tooltip): the tooltip text
+# displayed when you hover a warning group badge (i.e. repeated warning messages for a
+# given category, for example Content Blocked messages) in the web console output.
+# This is a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of message in the group.
+# example: 3 messages
+webconsole.warningGroup.messageCount.tooltip=#1 message;#1 messages;#1 messages;#1 messages;#1 messages
+
+# LOCALIZATION NOTE (webconsole.input.editor.onboarding.label): the text that is displayed
+# when displaying the multiline-input mode for the first time, until the user dismiss the
+# text.
+# Parameters: %1$S is Enter key, %2$S is the shorcut to evaluate the expression (
+# Ctrl+Enter or Cmd+Enter on OSX).
+webconsole.input.editor.onboarding.label=Iterate on your code faster with the new multi-line editor mode. Use %1$S to add new lines and %2$S to run.
+
+# LOCALIZATION NOTE (webconsole.input.editor.onboarding.dissmis.label): the text that is
+# displayed in the multiline-input mode onboarding UI to dismiss it.
+webconsole.input.editor.onboarding.dissmis.label=Got it!
+
+# LOCALIZATION NOTE (webconsole.enterKey): The text that will be used to represent the
+# Enter key in the editor onboarding UI, as well as on the Editor toolbar "Run" button
+# tooltip.
+webconsole.enterKey=Enter
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/shared/accessibility.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/shared/accessibility.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/shared/accessibility.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/shared/accessibility.properties	2019-09-15 11:35:05.000000000 +0000
@@ -19,3 +19,134 @@
 # contrast ratio description that also specifies that the color contrast criteria used is
 # if for large text.
 accessibility.contrast.ratio.label.large=Contrast (large text):
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.area): A title text that
+# describes that currently selected accessible object for an <area> element must have
+# its name provided via the alt attribute.
+accessibility.text.label.issue.area = Use “alt” attribute to label “area” elements that have the “href” attribute.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.dialog): A title text that
+# describes that currently selected accessible object for a dialog should have a name
+# provided.
+accessibility.text.label.issue.dialog = Dialogs should be labeled.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.document.title): A title text that
+# describes that currently selected accessible object for a document must have a name
+# provided via title.
+accessibility.text.label.issue.document.title = Documents must have a title.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.embed): A title text that
+# describes that currently selected accessible object for an <embed> must have a name
+# provided.
+accessibility.text.label.issue.embed = Embedded content must be labeled.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.figure): A title text that
+# describes that currently selected accessible object for a figure should have a name
+# provided.
+accessibility.text.label.issue.figure = Figures with optional captions should be labeled.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.fieldset): A title text that
+# describes that currently selected accessible object for a <fieldset> must have a name
+# provided.
+accessibility.text.label.issue.fieldset = “fieldset” elements must be labeled.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.fieldset.legend): A title text that
+# describes that currently selected accessible object for a <fieldset> must have a name
+# provided via <legend> element.
+accessibility.text.label.issue.fieldset.legend = Use “legend” element to label “fieldset” elements.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.fieldset.legend2): A title text that
+# describes that currently selected accessible object for a <fieldset> must have a name
+# provided via <legend> element.
+accessibility.text.label.issue.fieldset.legend2 = Use a “legend” element to label a “fieldset”.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.form): A title text that
+# describes that currently selected accessible object for a form element must have a name
+# provided.
+accessibility.text.label.issue.form = Form elements must be labeled.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.form.visible): A title text that
+# describes that currently selected accessible object for a form element should have a name
+# provided via a visible label/element.
+accessibility.text.label.issue.form.visible = Form elements should have a visible text label.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.frame): A title text that
+# describes that currently selected accessible object for a <frame> must have a name
+# provided.
+accessibility.text.label.issue.frame = “frame” elements must be labeled.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.glyph): A title text that
+# describes that currently selected accessible object for a <mglyph> must have a name
+# provided via alt attribute.
+accessibility.text.label.issue.glyph = Use “alt” attribute to label “mglyph” elements.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.heading): A title text that
+# describes that currently selected accessible object for a heading must have a name
+# provided.
+accessibility.text.label.issue.heading = Headings must be labeled.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.heading.content): A title text that
+# describes that currently selected accessible object for a heading must have visible
+# content.
+accessibility.text.label.issue.heading.content = Headings should have visible text content.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.iframe): A title text that
+# describes that currently selected accessible object for an <iframe> have a name
+# provided via title attribute.
+accessibility.text.label.issue.iframe = Use “title” attribute to describe “iframe” content.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.image): A title text that
+# describes that currently selected accessible object for graphical content must have a
+# name provided.
+accessibility.text.label.issue.image = Content with images must be labeled.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.interactive): A title text that
+# describes that currently selected accessible object for interactive element must have a
+# name provided.
+accessibility.text.label.issue.interactive = Interactive elements must be labeled.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.optgroup.label): A title text that
+# describes that currently selected accessible object for an <optgroup> must have a
+# name provided via label attribute.
+accessibility.text.label.issue.optgroup.label = Use “label” attribute to label “optgroup” elements.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.optgroup.label2): A title text that
+# describes that currently selected accessible object for an <optgroup> must have a
+# name provided via label attribute.
+accessibility.text.label.issue.optgroup.label2 = Use a “label” attribute to label an “optgroup”.
+
+# LOCALIZATION NOTE (accessibility.text.label.issue.toolbar): A title text that
+# describes that currently selected accessible object for a toolbar must have a
+# name provided when there is more than one toolbar in the document.
+accessibility.text.label.issue.toolbar = Toolbars must be labeled when there is more than one toolbar.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.semantics): A title text that
+# describes that currently selected accessible object is focusable and should
+# indicate that it could be interacted with.
+accessibility.keyboard.issue.semantics=Focusable elements should have interactive semantics.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.tabindex): A title text that
+# describes that currently selected accessible object has a corresponding
+# DOMNode that defines a tabindex attribute greater that 0 which can result in
+# unexpected behaviour when navigating with keyboard.
+accessibility.keyboard.issue.tabindex=Avoid using “tabindex” attribute greater than zero.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.action): A title text that
+# describes that currently selected accessible object is interactive but can not
+# be activated using keyboard or accessibility API.
+accessibility.keyboard.issue.action=Interactive elements must be able to be activated using a keyboard.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.focusable): A title text that
+# describes that currently selected accessible object is interactive but is not
+# focusable with a keyboard.
+accessibility.keyboard.issue.focusable=Interactive elements must be focusable.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.focus.visible): A title text
+# that describes that currently selected accessible object is focusable but
+# might not have appropriate focus styling.
+accessibility.keyboard.issue.focus.visible=Focusable element may be missing focus styling.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.mouse.only): A title text that
+# describes that currently selected accessible object is not focusable and not
+# semantic but can be activated via mouse (e.g. has click handler).
+accessibility.keyboard.issue.mouse.only=Clickable elements must be focusable and should have interactive semantics.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/startup/key-shortcuts.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/startup/key-shortcuts.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/br/devtools/startup/key-shortcuts.properties	2019-09-13 05:15:06.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/br/devtools/startup/key-shortcuts.properties	2019-09-15 11:35:05.000000000 +0000
@@ -38,6 +38,10 @@
 # Key pressed to open a toolbox with the web console panel selected
 webconsole.commandkey=K
 
+# LOCALIZATION NOTE (jsdebugger.commandkey):
+# Key pressed to open a toolbox with the debugger panel selected
+jsdebugger.commandkey=L
+
 # LOCALIZATION NOTE (netmonitor.commandkey):
 # Key pressed to open a toolbox with the network monitor panel selected
 netmonitor.commandkey=E
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/browser/newtab/asrouter.ftl	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/browser/newtab/asrouter.ftl	2019-09-15 11:35:15.000000000 +0000
@@ -82,6 +82,28 @@
     .label = Novetats
     .tooltiptext = Novetats
 cfr-whatsnew-panel-header = Novetats
+cfr-whatsnew-release-notes-link-text = Llegiu les notes de la versió
+cfr-whatsnew-fx70-title = Ara el { -brand-short-name } lluita encara més per la vostra privadesa
+cfr-whatsnew-fx70-body = La darrera actualització millora la funció de protecció contra el seguiment i permet crear contrasenyes segures per a cada lloc molt fàcilment.
+cfr-whatsnew-tracking-protect-title = Protegiu-vos dels elements de seguiment
+cfr-whatsnew-tracking-protect-body = El { -brand-short-name } bloca els elements de seguiment de xarxes socials i entre llocs més habituals que recopilen dades sobre allò que feu a Internet.
+cfr-whatsnew-tracking-protect-link-text = Vegeu el vostre informe
+# This string is displayed before a large numeral that indicates the total
+# number of tracking elements blocked. Don’t add $blockedCount to your
+# localization, because it would result in the number showing twice.
+cfr-whatsnew-tracking-blocked-title =
+    { $blockedCount ->
+        [one] Element de seguiment blocat
+       *[other] Elements de seguiment blocats
+    }
+cfr-whatsnew-tracking-blocked-subtitle = Des de: { DATETIME($earliestDate, month: "long", year: "numeric") }
+cfr-whatsnew-tracking-blocked-link-text = Vegeu l'informe
+cfr-whatsnew-lockwise-backup-title = Feu una còpia de seguretat de les vostres contrasenyes
+cfr-whatsnew-lockwise-backup-body = Ara podeu generar contrasenyes segures i accedir-hi des de tot arreu on inicieu la sessió.
+cfr-whatsnew-lockwise-backup-link-text = Activeu la còpia de seguretat
+cfr-whatsnew-lockwise-take-title = Les vostres contrasenyes, a tot arreu
+cfr-whatsnew-lockwise-take-body = L'aplicació mòbil del { -lockwise-brand-short-name } us permet accedir de manera segura a les contrasenyes desades des de qualsevol lloc.
+cfr-whatsnew-lockwise-take-link-text = Baixa l'aplicació
 
 ## Bookmark Sync
 
@@ -111,3 +133,16 @@
 cfr-doorhanger-firefox-send-body = Manteniu els vostres documents confidencials lluny de mirades indiscretes amb un xifratge d'extrem a extrem i un enllaç que desapareix quan hàgiu acabat.
 cfr-doorhanger-firefox-send-ok-button = Prova el { -send-brand-name }
     .accesskey = P
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Mostra les proteccions
+    .accesskey = M
+cfr-doorhanger-socialtracking-close-button = Tanca
+    .accesskey = T
+cfr-doorhanger-socialtracking-heading = El { -brand-short-name } ha impedit que una xarxa social us faci el seguiment fins aquí
+cfr-doorhanger-socialtracking-description = La vostra privadesa és important. Ara el { -brand-short-name } bloca els elements de seguiment de les xarxes socials més comunes. Això limita la quantitat de dades que poden recopilar sobre allò que feu a Internet.
+cfr-doorhanger-fingerprinters-heading = El { -brand-short-name } ha blocat un generador d'empremtes digitals en aquesta pàgina
+cfr-doorhanger-fingerprinters-description = La vostra privadesa és important. Ara el { -brand-short-name } bloca els generadors d'empremtes digitals, que recopilen informació del vostre dispositiu que us podria identificar per a fer-vos el seguiment.
+cfr-doorhanger-cryptominers-heading = El { -brand-short-name } ha blocat un miner de criptomonedes en aquesta pàgina
+cfr-doorhanger-cryptominers-description = La vostra privadesa és important. Ara el { -brand-short-name } bloca els miners de criptomonedes, que utilitzen la potència de càlcul del vostre ordinador per a la mineria de diners digitals.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/browser/preferences/preferences.ftl	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/browser/preferences/preferences.ftl	2019-09-15 11:35:15.000000000 +0000
@@ -339,6 +339,9 @@
 browsing-search-on-start-typing =
     .label = Cerca el text en començar a teclejar
     .accesskey = x
+browsing-picture-in-picture-toggle-enabled =
+    .label = Activa els controls de vídeo d'imatge sobre imatge
+    .accesskey = A
 browsing-picture-in-picture-learn-more = Més informació
 browsing-cfr-recommendations =
     .label = Recomana extensions durant la navegació
@@ -601,6 +604,9 @@
 forms-generate-passwords =
     .label = Suggereix i genera contrasenyes segures
     .accesskey = u
+forms-breach-alerts =
+    .label = Mostra alertes sobre contrasenyes per als llocs web relacionats amb filtracions de dades
+    .accesskey = b
 forms-breach-alerts-learn-more-link = Més informació
 forms-fill-logins-and-passwords =
     .label = Emplena automàticament inicis de sessió i contrasenyes
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/browser/protections.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/browser/protections.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/browser/protections.ftl	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/browser/protections.ftl	2019-09-15 11:35:15.000000000 +0000
@@ -13,10 +13,10 @@
 #   $count (Number) - Number of tracking events blocked.
 #   $earliestDate (Number) - Unix timestamp in ms, representing a date. The
 # earliest date recorded in the database.
-graph-total-summary =
+graph-total-tracker-summary =
     { $count ->
-        [one] S'ha blocat { $count } element de seguiment des del { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
-       *[other] S'han blocat { $count } elements de seguiment des del { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
+        [one] S'ha blocat <b>{ $count }</b> element de seguiment des del { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
+       *[other] S'han blocat <b>{ $count }</b> elements de seguiment des del { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
     }
 # The terminology used to refer to categories of Content Blocking is also used in chrome/browser/browser.properties and should be translated consistently.
 # "Standard" in this case is an adjective, meaning "default" or "normal".
@@ -31,16 +31,23 @@
 # This string is used to label the X axis of a graph. Other days of the week are generated via Intl.DateTimeFormat,
 # capitalization for this string should match the output for your locale.
 graph-today = avui
+# This string is used to describe the graph for screenreader users.
+graph-legend-description = Un gràfic que conté el nombre total d'elements de seguiment blocats aquesta setmana, classificats per tipus.
 social-tab-title = Elements de seguiment de xarxes socials
+social-tab-contant = Les xarxes socials col·loquen elements de seguiment en altres llocs web per a fer el seguiment d'allò que feu i veieu a Internet. Això permet a les empreses de xarxes socials recopilar informació de tot allò que compartiu en els vostres perfils de xarxes socials. <a data-l10n-name="learn-more-link">Més informació</a>
 cookie-tab-title = Galetes de seguiment entre llocs
+cookie-tab-content = Aquestes galetes us segueixen de lloc en lloc per recollir dades sobre allò que feu a Internet. Les desen tercers, com ara anunciants i empreses d'anàlisi de dades. Si bloqueu les galetes de seguiment entre llocs, reduireu el nombre d'anuncis que us fan el seguiment mentre navegueu. <a data-l10n-name="learn-more-link">Més informació</a>
 tracker-tab-title = Contingut que fa seguiment
+tracker-tab-description = Els llocs web poden carregar anuncis, vídeos i altre contingut extern amb un codi de seguiment. Si bloqueu aquest contingut que fa seguiment, els llocs web es poden carregar més de pressa, però és possible alguns botons, formularis o camps d'inici de sessió no funcionin. <a data-l10n-name="learn-more-link">Més informació</a>
 fingerprinter-tab-title = Generadors d'empremtes digitals
+fingerprinter-tab-content = Els generadors d'empremtes digitals recopilen els paràmetres del vostre navegador per a crear un perfil vostre. A partir d'aquesta empremta digital, us poden fer el seguiment entre els diferents llocs web. <a data-l10n-name="learn-more-link">Més informació</a>
 cryptominer-tab-title = Miners de criptomonedes
+cryptominer-tab-content = Els miners de criptomonedes utilitzen la potència de càlcul del vostre ordinador per a la mineria de diners digitals. Els scripts de mineria de criptomonedes consumeixen la bateria, alenteixen l'ordinador i poden augmentar la vostra factura d'electricitat. <a data-l10n-name="learn-more-link">Més informació</a>
 lockwise-title = No oblideu mai més cap contrasenya
 lockwise-title-logged-in = { -lockwise-brand-name }
 lockwise-header-content = { -lockwise-brand-name } emmagatzema les contrasenyes de forma segura en el vostre navegador.
 lockwise-header-content-logged-in = Deseu i sincronitzeu les contrasenyes de forma segura en tots els vostres dispositius.
-open-about-logins-button = Obre al { -brand-short-name }
+about-logins-view-logins-button = Mostra els inicis de sessió
 lockwise-no-logins-content = Instal·leu l'aplicació <a data-l10n-name="lockwise-inline-link">{ -lockwise-brand-name }</a> per accedir a les vostres contrasenyes des de qualsevol lloc.
 # This string is displayed after a large numeral that indicates the total number
 # of email addresses being monitored. Don’t add $count to
@@ -60,36 +67,36 @@
         [one] S'està sincronitzant amb { $count } altre dispositiu.
        *[other] S'està sincronitzant amb { $count } altres dispositius.
     }
-lockwise-sync-not-syncing = No se sincronitza amb altres dispositius.
+lockwise-sync-not-syncing-devices = No se sincronitza amb altres dispositius
 monitor-title = Tingueu controlades les filtracions de dades
 monitor-link = Com funciona
-monitor-header-content = Visiteu el { -monitor-brand-name } per veure si hi ha alguna filtració de dades que us hagi afectat i obteniu alertes de noves filtracions.
-monitor-header-content-logged-in = El { -monitor-brand-name } us avisa si la vostra informació ha aparegut en alguna filtració de dades coneguda
+monitor-header-content-no-account = Visiteu el { -monitor-brand-name } per veure si hi ha alguna filtració de dades coneguda que us hagi afectat i obteniu alertes de noves filtracions.
+monitor-header-content-signed-in = El { -monitor-brand-name } us avisa si la vostra informació ha aparegut en alguna filtració de dades coneguda.
 monitor-sign-up = Subscriviu-vos-hi per rebre alertes de filtracions
 auto-scan = S'ha comprovat avui automàticament
 # This string is displayed after a large numeral that indicates the total number
 # of email addresses being monitored. Don’t add $count to
 # your localization, because it would result in the number showing twice.
-info-monitored-addresses =
+info-monitored-emails =
     { $count ->
-        [one] adreça electrònica supervisada.
-       *[other] adreces electròniques supervisades.
+        [one] adreça electrònica supervisada
+       *[other] adreces electròniques supervisades
     }
 # This string is displayed after a large numeral that indicates the total number
 # of known data breaches. Don’t add $count to
 # your localization, because it would result in the number showing twice.
-info-known-breaches =
+info-known-breaches-found =
     { $count ->
-        [one] filtració de dades coneguda ha exposat informació vostra.
-       *[other] filtracions de dades conegudes han exposat informació vostra.
+        [one] filtració de dades coneguda ha exposat informació vostra
+       *[other] filtracions de dades conegudes han exposat informació vostra
     }
 # This string is displayed after a large numeral that indicates the total number
 # of exposed passwords. Don’t add $count to
 # your localization, because it would result in the number showing twice.
-info-exposed-passwords =
+info-exposed-passwords-found =
     { $count ->
-        [one] contrasenya exposada entre totes les filtracions.
-       *[other] contrasenyes exposades entre totes les filtracions.
+        [one] contrasenya exposada entre totes les filtracions
+       *[other] contrasenyes exposades entre totes les filtracions
     }
 full-report-link = Vegeu l'informe complet al <a data-l10n-name="monitor-inline-link">{ -monitor-brand-name }</a>
 # This string is displayed after a large numeral that indicates the total number
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/chrome/browser/browser.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/chrome/browser/browser.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/chrome/browser/browser.properties	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/chrome/browser/browser.properties	2019-09-15 11:35:15.000000000 +0000
@@ -50,6 +50,8 @@
 # the administration can add to the message.
 addonInstallBlockedByPolicy=L'administrador del sistema ha blocat %1$S (%2$S).%3$S
 
+addonInstallFullScreenBlocked=No es permet instal·lar cap complement mentre estigueu en el mode de pantalla completa, o abans d'entrar-hi.
+
 # LOCALIZATION NOTE (webextPerms.header)
 # This string is used as a header in the webextension permissions dialog,
 # %S is replaced with the localized name of the extension being installed.
@@ -480,14 +482,15 @@
 # %S is the hostname of the site that is being displayed.
 identity.headerWithHost=Informació del lloc %S
 
-# LOCALIZATION NOTE (identity.headerMainWithHost):
+# LOCALIZATION NOTE (identity.headerMainWithHost, identity.headerSecurityWithHost):
 # %S is the hostname of the site that is being displayed.
 identity.headerMainWithHost=Informació del lloc %S
+identity.headerSecurityWithHost=Seguretat de la connexió per a %S
 identity.identified.verifier=Verificat per: %S
 identity.identified.verified_by_you=Heu afegit una excepció de seguretat per a aquest lloc web.
 identity.identified.state_and_country=%S, %S
 
-identity.ev.contentOwner=El lloc és propietat de: %S
+identity.ev.contentOwner2=Certificat emès per a: %S
 
 # LOCALIZATION NOTE (identity.notSecure.label):
 # Keep this string as short as possible, this is displayed in the URL bar
@@ -1122,6 +1125,9 @@
 
 permissions.remove.tooltip = Esborra aquest permís i torna-ho a demanar
 
+permissions.fullscreen.promptCanceled = S'han cancel·lat les sol·licituds de permís pendents: no es poden emetre sol·licituds de permís abans d'entrar en la pantalla completa de DOM.
+permissions.fullscreen.fullScreenCanceled = S'ha sortit de la pantalla completa de DOM: no es poden emetre sol·licituds de permís mentre estigueu en la pantalla completa de DOM.
+
 # LOCALIZATION NOTE (aboutDialog.architecture.*):
 # The sixtyFourBit and thirtyTwoBit strings describe the architecture of the
 # current Firefox build: 32-bit or 64-bit. These strings are used in parentheses
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/chrome/browser/fxmonitor.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/chrome/browser/fxmonitor.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/chrome/browser/fxmonitor.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/chrome/browser/fxmonitor.properties	2019-09-15 11:35:15.000000000 +0000
@@ -0,0 +1,45 @@
+# 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/.
+
+# Header of the popup
+fxmonitor.popupHeader=Ja teniu un compte en aquest lloc?
+# Firefox Monitor must be treated as a brand, and kept in English.
+# It cannot be:
+# - Declined to adapt to grammatical case.
+# - Transliterated.
+# - Translated.
+fxmonitor.brandName=Firefox Monitor
+# Tooltip text for the popup's anchor icon in the URL bar
+# %S is replaced with fxmonitor.brandName.
+fxmonitor.anchorIcon.tooltiptext=S'ha informat d'aquest lloc al %S
+# Text content of popup. Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This version is only used when the number of accounts is smaller than 100,000.
+# The placeholders are:
+# #1: The exact number of accounts compromised in the breach.
+# #2: The name of the breached site.
+# #3: The year of the breach.
+# #4: The brand name ("Firefox Monitor").
+fxmonitor.popupText=#1 compte de #2 s'ha vist compromès el #3. Visiteu el #4 per veure si el vostre compte està en risc.;#1 comptes de #2 s'han vist compromesos el #3. Visiteu el #4 per veure si el vostre compte està en risc.
+# Text content of popup. Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This version is only used when the number of accounts is greater than 100,000.
+# The placeholders are:
+# #1: The number of accounts compromised in the breach, rounded down to the
+#     most significant digit.
+#     Ex.: 234,567 -> More than 200,000 accounts [...]
+#          345,678,901 -> More than 300,000,000 accounts [...]
+#          4,567,890,123 -> More than 4,000,000,000 accounts [...]
+# #2: The name of the breached site.
+# #3: The year of the breach.
+# #4: The brand name ("Firefox Monitor").
+fxmonitor.popupTextRounded=Més d'#1 compte de #2 s'ha vist compromès el #3. Vegeu el #4 per veure si el vostre compte està en risc.;Més de #1 comptes de #2 s'han vist compromesos el #3. Vegeu #4 per veure si el vostre compte està en risc.
+# %S is replaced with fxmonitor.brandName.
+fxmonitor.checkButton.label=Comprova el %S
+fxmonitor.checkButton.accessKey=C
+fxmonitor.dismissButton.label=Descarta
+fxmonitor.dismissButton.accessKey=D
+# %S is replaced with fxmonitor.brandName.
+fxmonitor.neverShowButton.label=No mostris mai alertes del %S
+fxmonitor.neverShowButton.accessKey=N
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/extensions/fxmonitor/fxmonitor.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/extensions/fxmonitor/fxmonitor.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/extensions/fxmonitor/fxmonitor.properties	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/extensions/fxmonitor/fxmonitor.properties	2019-09-15 11:35:15.000000000 +0000
@@ -0,0 +1,45 @@
+# 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/.
+
+# Header of the popup
+fxmonitor.popupHeader=Ja teniu un compte en aquest lloc?
+# Firefox Monitor must be treated as a brand, and kept in English.
+# It cannot be:
+# - Declined to adapt to grammatical case.
+# - Transliterated.
+# - Translated.
+fxmonitor.brandName=Firefox Monitor
+# Tooltip text for the popup's anchor icon in the URL bar
+# %S is replaced with fxmonitor.brandName.
+fxmonitor.anchorIcon.tooltiptext=S'ha informat d'aquest lloc al %S
+# Text content of popup. Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This version is only used when the number of accounts is smaller than 100,000.
+# The placeholders are:
+# #1: The exact number of accounts compromised in the breach.
+# #2: The name of the breached site.
+# #3: The year of the breach.
+# #4: The brand name ("Firefox Monitor").
+fxmonitor.popupText=#1 compte de #2 s'ha vist compromès el #3. Visiteu el #4 per veure si el vostre compte està en risc.;#1 comptes de #2 s'han vist compromesos el #3. Visiteu el #4 per veure si el vostre compte està en risc.
+# Text content of popup. Semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# This version is only used when the number of accounts is greater than 100,000.
+# The placeholders are:
+# #1: The number of accounts compromised in the breach, rounded down to the
+#     most significant digit.
+#     Ex.: 234,567 -> More than 200,000 accounts [...]
+#          345,678,901 -> More than 300,000,000 accounts [...]
+#          4,567,890,123 -> More than 4,000,000,000 accounts [...]
+# #2: The name of the breached site.
+# #3: The year of the breach.
+# #4: The brand name ("Firefox Monitor").
+fxmonitor.popupTextRounded=Més d'#1 compte de #2 s'ha vist compromès el #3. Vegeu el #4 per veure si el vostre compte està en risc.;Més de #1 comptes de #2 s'han vist compromesos el #3. Vegeu #4 per veure si el vostre compte està en risc.
+# %S is replaced with fxmonitor.brandName.
+fxmonitor.checkButton.label=Comprova el %S
+fxmonitor.checkButton.accessKey=C
+fxmonitor.dismissButton.label=Descarta
+fxmonitor.dismissButton.accessKey=D
+# %S is replaced with fxmonitor.brandName.
+fxmonitor.neverShowButton.label=No mostris mai alertes del %S
+fxmonitor.neverShowButton.accessKey=N
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/pdfviewer/viewer.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/pdfviewer/viewer.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/browser/pdfviewer/viewer.properties	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/browser/pdfviewer/viewer.properties	2019-09-15 11:35:15.000000000 +0000
@@ -72,6 +72,12 @@
 scroll_wrapped.title=Activa el desplaçament continu
 scroll_wrapped_label=Desplaçament continu
 
+spread_none.title=No agrupis les pàgines de dues en dues
+spread_none_label=Una sola pàgina
+spread_odd.title=Mostra dues pàgines començant per les pàgines de numeració senar
+spread_odd_label=Doble pàgina (senar)
+spread_even.title=Mostra dues pàgines començant per les pàgines de numeració parell
+spread_even_label=Doble pàgina (parell)
 
 # Document properties dialog box
 document_properties.title=Propietats del document…
@@ -220,6 +226,10 @@
 missing_file_error=Falta el fitxer PDF.
 unexpected_response_error=Resposta inesperada del servidor.
 
+# LOCALIZATION NOTE (annotation_date_string): "{{date}}" and "{{time}}" will be
+# replaced by the modification date, and time, of the annotation.
+annotation_date_string={{date}}, {{time}}
+
 # LOCALIZATION NOTE (text_annotation_type.alt): This is used as a tooltip.
 # "{{type}}" will be replaced with an annotation type from a list defined in
 # the PDF spec (32000-1:2008 Table 169 – Annotation types).
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/devtools/startup/aboutDevTools.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/devtools/startup/aboutDevTools.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/devtools/startup/aboutDevTools.ftl	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/devtools/startup/aboutDevTools.ftl	2019-09-15 11:35:15.000000000 +0000
@@ -23,9 +23,17 @@
 features-console-title = Consola
 features-debugger-title = Depurador
 features-network-title = Xarxa
+features-network-desc = Superviseu les sol·licituds de xarxa que poden alentir o blocar el vostre lloc. <a data-l10n-name="learn-more">{ features-learn-more }</a>
 features-storage-title = Emmagatzematge
+features-storage-desc = Afegiu, modifiqueu i elimineu la memòria cau, les galetes, bases de dades i les dades de sessió. <a data-l10n-name="learn-more">{ features-learn-more }</a>
 features-responsive-title = Mode de disseny responsiu
 features-visual-editing-title = Edició visual
+features-visual-editing-desc = Ajusteu les animacions, l'alineació i el farciment. <a data-l10n-name="learn-more">{ features-learn-more }</a>
 features-performance-title = Rendiment
+features-performance-desc = Desbloqueu els colls d'ampolla, optimitzeu els processos i els recursos. <a data-l10n-name="learn-more">{ features-learn-more }</a>
 features-memory-title = Memòria
+# Variables:
+#   $errorDescription (String) - The error that occurred e.g. 404 - Not Found
+newsletter-error-common = Ha fallat la sol·licitud de subscripció ({ $errorDescription }).
 newsletter-error-unknown = S'ha produït un error inesperat.
+newsletter-error-timeout = S'ha esgotat el temps d'espera de la sol·licitud de subscripció
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/netwerk/necko.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/netwerk/necko.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/netwerk/necko.properties	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/netwerk/necko.properties	2019-09-15 11:35:15.000000000 +0000
@@ -23,7 +23,6 @@
 27=Està començant la transacció FTP…
 28=S'ha acabat la transacció FTP
 
-UnsupportedFTPServer=Actualment no es pot treballar amb el servidor FTP %1$S.
 RepostFormData=Aquesta pàgina web s'està redirigint a una altra ubicació. Voleu reenviar-hi les dades del formulari que heu introduït?
 
 # Directory listing strings
@@ -40,13 +39,10 @@
 SuperfluousAuth=Ara entrareu al lloc «%1$S» amb el nom d'usuari «%2$S», però el lloc web no requereix autentificació. Podria ser intent d'enganyar-vos.\n\nÉs «%1$S» el lloc que voleu visitar?
 AutomaticAuth=Ara entrareu al lloc «%1$S» amb el nom d'usuari «%2$S».
 
-TrackingUriBlocked=S'ha blocat el recurs del lloc «%1$S» perquè la protecció contra el seguiment està activada.
+TrackerUriBlocked=S'ha blocat el recurs del lloc «%1$S» perquè el bloqueig de contingut està activat.
 UnsafeUriBlocked=La funció de navegació segura ha blocat el recurs del lloc «%1$S».
 
-# LOCALIZATION NOTE (APIDeprecationWarning):
-# %1$S is the deprecated API; %2$S is the API function that should be used.
-APIDeprecationWarning=Avís: «%1$S» està en desús; utilitzeu «%2$S»
-
-# LOCALIZATION NOTE (nsICookieManagerDeprecated): don't localize originAttributes.
-# %1$S is the deprecated API; %2$S is the interface suffix that the given deprecated API belongs to.
-nsICookieManagerAPIDeprecated=«%1$S» ha canviat. Actualitzeu el codi i passeu el valor d'«originAttributes» correcte. Més informació a MDN: https://developer.mozilla.org/docs/Mozilla/Tech/XPCOM/Reference/Interface/nsICookieManager%2$S
+# LOCALIZATION NOTE (CookieAllowedForOriginOnTrackerByStorageAccessAPI): %3$S, %2$S and %1$S are URLs.
+# LOCALIZATION NOTE (CookieAllowedForTrackerByStorageAccessAPI): %2$S and %1$S are URLs.
+# LOCALIZATION NOTE (CookieAllowedForOriginOnTrackerByHeuristic): %3$S, %2$S and %1$S are URLs.
+# LOCALIZATION NOTE (CookieAllowedForTrackerByHeuristic): %2$S and %1$S are URLs.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/security/manager/chrome/pipnss/pipnss.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/security/manager/chrome/pipnss/pipnss.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/security/manager/chrome/pipnss/pipnss.properties	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/security/manager/chrome/pipnss/pipnss.properties	2019-09-15 11:35:15.000000000 +0000
@@ -17,19 +17,6 @@
 #
 # Simply replace YOURSTRING with your translation.
 #
-# If it's not possible to produce an understandable translation withing these
-# limits, keeping the English text is an acceptable workaround.
-
-# The following strings have special requirements: they must fit in a 32 or 64
-# bytes buffer after being encoded to UTF-8.
-#
-# It's possible to verify the length of a translation using the Browser Console
-# in Firefox and evaluating the following code:
-#
-# (new TextEncoder('utf-8').encode('YOURSTRING')).length
-#
-# Simply replace YOURSTRING with your translation.
-#
 # If it's not possible to produce an understandable translation within these
 # limits, keeping the English text is an acceptable workaround.
 
@@ -69,18 +56,10 @@
 # conversion to UTF-8.
 # length_limit = 64 bytes
 Fips140SlotDescription=Xifratge, clau i serveis de certificat FIPS 140
-# LOCALIZATION NOTE (InternalToken): string limit is 32 bytes after conversion
-# to UTF-8.
-# length_limit = 32 bytes
-InternalToken=Dispositiu de seguretat
 
-VerifySSLClient=Certificat de client SSL
-VerifySSLServer=Certificat de servidor SSL
-VerifySSLCA=Entitat certificadora SSL
-VerifyEmailSigner=Certificat de signatura de correu electrònic
-VerifyEmailRecip=Certificat de destinatari de correu electrònic
 HighGrade=Nivell alt
 MediumGrade=Nivell mitjà
+
 # LOCALIZATION NOTE (nick_template): $1s is the common name from a cert (e.g. "Mozilla"), $2s is the CA name (e.g. VeriSign)
 nick_template=ID de %2$s de %1$s
 #These are the strings set for the ASN1 objects in a certificate.
@@ -97,7 +76,7 @@
 CertDumpSHA512WithRSA=PKCS #1 SHA-512 amb xifratge RSA
 CertDumpDefOID=Identificador de l'objecte (%S)
 CertDumpIssuer=Emissor
-CertDumpSubject=Assumpte
+CertDumpSubject=Subjecte
 CertDumpAVACountry=C
 CertDumpAVAState=ST
 CertDumpAVALocality=L
@@ -122,13 +101,13 @@
 CertDumpRSATemplate=Mòdul (%S bits):\n%S\nExponent (%S bits):\n%S
 CertDumpECTemplate=Mida de la clau: %S bits\nLongitud d'ordre del punt base: %S bits\nValor públic:\n%S
 CertDumpIssuerUniqueID=Identificador únic de l'emissor
-CertDumpSubjPubKey=Clau pública personal
-CertDumpSubjectUniqueID=Identificador únic personal
+CertDumpSubjPubKey=Clau pública del subjecte
+CertDumpSubjectUniqueID=Identificador únic del subjecte
 CertDumpExtensions=Extensions
-CertDumpSubjectDirectoryAttr=Atributs del directori d'assumpte del certificat
-CertDumpSubjectKeyID=Identificador de la clau de l'assumpte del certificat
+CertDumpSubjectDirectoryAttr=Atributs del directori del subjecte del certificat
+CertDumpSubjectKeyID=Identificador de la clau del subjecte del certificat
 CertDumpKeyUsage=Ús de la clau del certificat
-CertDumpSubjectAltName=Nom alternatiu de l'assumpte del certificat
+CertDumpSubjectAltName=Nom alternatiu del subjecte del certificat
 CertDumpIssuerAltName=Nom alternatiu de l'emissor del certificat
 CertDumpBasicConstraints=Restriccions bàsiques de certificat
 CertDumpNameConstraints=Restriccions al nom del certificat
@@ -270,24 +249,12 @@
 CertDumpECsect571k1=SECG corba el·líptica sect571k1 (conegut com NIST K-571)
 CertDumpECsect571r1=SECG corba el·líptica sect571r1 (conegut com NIST B-571)
 CertDumpRawBytesHeader=Mida: %S bytes / %S bits
-PK11BadPassword=La contrasenya no és correcta.
-PKCS12DecodeErr=No s'ha pogut descodificar el fitxer. Pot ser que no estigui en format PKCS #12, que estigui malmès, o que la contrasenya que heu introduït sigui incorrecta.
-PKCS12UnknownErrRestore=No s'ha pogut restaurar el fitxer PKCS #12 per raons desconegudes.
-PKCS12UnknownErrBackup=No s'ha pogut crear el fitxer de còpia de seguretat PKCS #12 per raons desconegudes.
-PKCS12UnknownErr=L'operació PKCS #12 ha fallat per raons desconegudes.
-PKCS12InfoNoSmartcardBackup=No és possible fer còpies de seguretat dels certificats des d'un dispositiu de seguretat de maquinari com ara una targeta intel·ligent.
-PKCS12DupData=El certificat i la clau privada ja són al dispositiu de seguretat.
-AddModuleFailure=No s'ha pogut afegir el mòdul
-DelModuleWarning=Esteu segur que voleu suprimir aquest mòdul de seguretat?
-DelModuleError=No s'ha pogut suprimir el mòdul
 AVATemplate=%S = %S
 
 PSMERR_SSL_Disabled=No es pot connectar de forma segura perquè s'ha inhabilitat el protocol SSL.
 PSMERR_SSL2_Disabled=No es pot connectar de forma segura perquè el lloc utilitza una versió antiga i insegura del protocol SSL.
 PSMERR_HostReusedIssuerSerial=Heu rebut un certificat que no és vàlid. Contacteu amb l'administrador del servidor o amb el remitent de correu electrònic i doneu-los aquesta informació:\n\nEl certificat conté el mateix número de sèrie que un altre certificat emès per l'entitat certificadora. Obteniu un altre certificat que contingui un número de sèrie únic.
 
-SSLConnectionErrorPrefix=S'ha produït un error durant la connexió a %S.
-
 # LOCALIZATION NOTE (SSLConnectionErrorPrefix2): %1$S is the host string, %2$S is more detailed information (localized as well).
 SSLConnectionErrorPrefix2=S'ha produït un error durant la connexió a %1$S. %2$S\n
 
@@ -297,28 +264,30 @@
 certErrorTrust_UnknownIssuer=No es confia en el certificat perquè se'n desconeix l'emissor.
 certErrorTrust_UnknownIssuer2=És possible que el servidor no estigui enviant els certificats intermedis.
 certErrorTrust_UnknownIssuer3=És possible que calgui importar un certificat arrel addicional.
+# LOCALIZATION NOTE (certErrorTrust_UnknownIssuer6): %1$S is replaced by the brand name, %2$S is replaced by host name.
 certErrorTrust_CaInvalid=No es confia en el certificat perquè fou emès per un certificat de CA no vàlid.
 certErrorTrust_Issuer=No es confia en el certificat perquè no es confia tampoc en l'emissor del certificat.
 certErrorTrust_SignatureAlgorithmDisabled=No es confia en el certificat perquè ha estat signat amb un algorisme de signatura que va ser inhabilitat per no ser segur.
 certErrorTrust_ExpiredIssuer=No es confia en el certificat perquè l'emissor del certificat ha vençut.
 certErrorTrust_Untrusted=El certificat no prové d'una font de confiança.
 
-
 certErrorMismatch=El certificat no és vàlid per al nom de domini %S.
-# LOCALIZATION NOTE (certErrorMismatchSingle2): Do not translate <a id="cert_domain_link" title="%1$S">%1$S</a>
-certErrorMismatchSingle2=El certificat només és vàlid per a <a id="cert_domain_link" title="%1$S">%1$S</a>.
-certErrorMismatchSinglePlain=El certificat només es vàlid per a %S
+# LOCALIZATION NOTE (certErrorMismatch3, certErrorMismatchSinglePrefix3, certErrorMismatchMultiple3): %1$S is replaced by the brand name, %2$S is replaced by host name.
 # LOCALIZATION NOTE (certErrorMismatchSinglePrefix): %S is replaced by the domain for which the certificate is valid
 certErrorMismatchSinglePrefix=El certificat només es vàlid per a %S.
 certErrorMismatchMultiple=El certificat només és vàlid per als noms següents:
 
 # LOCALIZATION NOTE (certErrorExpiredNow): Do not translate %1$S (date+time of expired certificate) or %2$S (current date+time)
 certErrorExpiredNow=El certificat ha vençut el %1$S. L'hora actual és %2$S.
+
 # LOCALIZATION NOTE (certErrorNotYetValidNow): Do not translate %1$S (date+time certificate will become valid) or %2$S (current date+time)
 certErrorNotYetValidNow=El certificat no serà vàlid fins al %1$S. L'hora actual és %2$S.
 
-# LOCALIZATION NOTE (certErrorCodePrefix2): Do not translate <a id="errorCode" title="%1$S">%1$S</a>
-certErrorCodePrefix2=Codi d'error: <a id="errorCode" title="%1$S">%1$S</a>
+# LOCALIZATION NOTE (certErrorMitM2): %S is brandShortName
+# LOCALIZATION NOTE (certErrorMitM3): %S is brandShortName
+
+# LOCALIZATION NOTE (certErrorSymantecDistrustDescription1): %S will be replaced by the domain for which the certificate is valid.
+
 
 # LOCALIZATION NOTE (certErrorCodePrefix3): %S is replaced by the error code.
 certErrorCodePrefix3=Codi d'error: %S
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/toolkit/chrome/mozapps/profile/profileSelection.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/toolkit/chrome/mozapps/profile/profileSelection.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/toolkit/chrome/mozapps/profile/profileSelection.properties	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/toolkit/chrome/mozapps/profile/profileSelection.properties	2019-09-15 11:35:15.000000000 +0000
@@ -45,6 +45,7 @@
 profileFinishTextMac=Feu clic a Fet per crear el perfil nou.
 profileMissing=No es pot carregar el vostre perfil del %S. Potser no hi és o no és accessible.
 profileMissingTitle=Falta el perfil
+profileDeletionFailed=No s’ha pogut suprimir el perfil perquè potser s'està utilitzant.
 profileDeletionFailedTitle=No s'ha pogut suprimir
 
 # Profile reset
@@ -53,6 +54,8 @@
 
 flushFailTitle=No s'han desat els canvis
 # LOCALIZATION NOTE (conflictMessage): %1$S is brandProductName, %2$S is brandShortName.
+conflictMessage=Una altra còpia del %1$S ha modificat els perfils. Heu de reiniciar el %2$S per a poder fer més canvis.
+flushFailMessage=Un error inesperat ha impedit que es desin els vostres canvis.
 # LOCALIZATION NOTE (flushFailRestartButton): $S is brandShortName.
 flushFailRestartButton=Reinicia el %S
 flushFailExitButton=Surt
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/toolkit/toolkit/about/aboutAddons.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/toolkit/toolkit/about/aboutAddons.ftl	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/toolkit/toolkit/about/aboutAddons.ftl	2019-09-15 11:35:15.000000000 +0000
@@ -98,9 +98,11 @@
 # cannot be overridden by the user.
 detail-private-disallowed-label = No es permet en finestres privades
 detail-private-disallowed-description = Aquesta extensió no s'executa durant la navegació privada. <label data-l10n-name="detail-private-browsing-learn-more">Més informació</label>
+detail-private-disallowed-description2 = Aquesta extensió no s'executa durant la navegació privada. <a data-l10n-name="learn-more">Més informació</a>
 # Some special add-ons are privileged, run in private windows automatically, and this permission can't be revoked
 detail-private-required-label = Necessita accés a les finestres privades
 detail-private-required-description = Aquesta extensió té accés a la vostra activitat a Internet durant la navegació privada. <label data-l10n-name="detail-private-browsing-learn-more">Més informació</label>
+detail-private-required-description2 = Aquesta extensió té accés a la vostra activitat a Internet durant la navegació privada. <a data-l10n-name="learn-more">Més informació</a>
 detail-private-browsing-on =
     .label = Permet
     .tooltiptext = Activa en la navegació privada
@@ -291,6 +293,10 @@
 # the detailed add-on view is opened, from where the add-on can be managed.
 manage-addon-button = Gestiona
 find-more-addons = Cerqueu més complements
+# This is a label for the button to open the "more options" menu, it is only
+# used for screen readers.
+addon-options-button =
+    .aria-label = Més opcions
 
 ## Add-on actions
 
@@ -361,6 +367,11 @@
 # badge is the private browsing icon included next to the extension's name.
 addon-badge-private-browsing-allowed =
     .title = Es permet en finestres privades
+# This is the tooltip text for the private browsing badge in about:addons. The
+# badge is the private browsing icon included next to the extension's name.
+addon-badge-private-browsing-allowed2 =
+    .title = Es permet en finestres privades
+    .aria-label = { addon-badge-private-browsing-allowed2.title }
 addon-detail-private-browsing-help = Si ho permeteu, l'extensió tindrà accés a la vostra activitat a Internet encara que utilitzeu la navegació privada. <label data-l10n-name="detail-private-browsing-learn-more">Més informació</label>
 addon-detail-private-browsing-allow = Permet
 addon-detail-private-browsing-disallow = No ho permetis
@@ -369,6 +380,11 @@
 addon-badge-recommended =
     .title = Recomanat
     .alt = Recomanat
+# This is the tooltip text for the recommended badge for an extension in about:addons. The
+# badge is a small icon displayed next to an extension when it is recommended on AMO.
+addon-badge-recommended2 =
+    .title = El { -brand-product-name } només recomana extensions que compleixen els nostres estàndards de seguretat i de rendiment
+    .aria-label = { addon-badge-recommended2.title }
 available-updates-heading = Actualitzacions disponibles
 recent-updates-heading = Actualitzacions recents
 release-notes-loading = S'està carregant…
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/toolkit/toolkit/about/aboutSupport.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/toolkit/toolkit/about/aboutSupport.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/toolkit/toolkit/about/aboutSupport.ftl	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/toolkit/toolkit/about/aboutSupport.ftl	2019-09-15 11:35:15.000000000 +0000
@@ -36,8 +36,8 @@
 # as in "Folder for updates". "Update" is a noun, not a verb.
 app-basics-update-dir =
     { PLATFORM() ->
-        [linux] Directori d'actualització
-       *[other] Carpeta d'actualització
+        [linux] Directori d'actualitzacions
+       *[other] Carpeta d'actualitzacions
     }
 app-basics-update-history = Historial d'actualitzacions
 app-basics-show-update-history = Mostra l'historial d'actualitzacions
@@ -51,11 +51,12 @@
 app-basics-enabled-plugins = Connectors habilitats
 app-basics-build-config = Configuració de la versió
 app-basics-user-agent = Agent d'usuari
-app-basics-os = SO
+app-basics-os = Sistema operatiu
 app-basics-memory-use = Utilització de la memòria
 app-basics-performance = Rendiment
 app-basics-service-workers = Processos de treball de servei registrats
 app-basics-profiles = Perfils
+app-basics-launcher-process-status = Procés d'inici
 app-basics-multi-process-support = Finestres multiprocés
 app-basics-remote-processes-count = Processos remots
 app-basics-enterprise-policies = Polítiques d'empresa
@@ -110,6 +111,13 @@
 sandbox-sys-call-args = Arguments
 safe-mode-title = Proveu el mode segur
 restart-in-safe-mode-label = Reinicia amb els complements inhabilitats…
+
+## Media titles
+
+audio-backend = Sistema de fons d'àudio
+max-audio-channels = Nombre màxim de canals
+channel-layout = Disposició de canals preferida
+sample-rate = Freqüència de mostratge preferida
 media-title = Multimèdia
 media-output-devices-title = Dispositius de sortida
 media-input-devices-title = Dispositius d'entrada
@@ -122,6 +130,10 @@
 media-device-channels = Canals
 media-device-rate = Freqüència
 media-device-latency = Latència
+media-capabilities-title = Capacitats multimèdia
+
+
+
 intl-title = Internacionalització i localització
 intl-app-title = Paràmetres de l'aplicació
 intl-locales-requested = Llengües sol·licitades
@@ -222,7 +234,6 @@
 glcontext-crash-guard = OpenGL
 reset-on-next-restart = Reinicialitza als valors per defecte en el proper reinici
 gpu-process-kill-button = Finalitza el procés de GPU
-audio-backend = Sistema de fons d'àudio
 min-lib-versions = Versió mínima esperada
 loaded-lib-versions = Versió en ús
 has-seccomp-bpf = Seccomp-BPF (filtratge de crides del sistema)
@@ -235,6 +246,8 @@
 effective-content-sandbox-level = Nivell de l'entorn de proves de processos de contingut efectiu
 sandbox-proc-type-content = contingut
 sandbox-proc-type-media-plugin = connector multimèdia
+launcher-process-status-0 = Activat
+launcher-process-status-1 = Desactivat a causa d'un error
 # Variables
 # $remoteWindows (integer) - Number of remote windows
 # $totalWindows (integer) - Number of total windows
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/toolkit/toolkit/global/processTypes.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/toolkit/toolkit/global/processTypes.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/toolkit/toolkit/global/processTypes.ftl	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/toolkit/toolkit/global/processTypes.ftl	2019-09-15 11:35:15.000000000 +0000
@@ -18,6 +18,9 @@
 # process used to isolate webpages that requested special
 # permission to allocate large amounts of memory
 process-type-weblargeallocation = Assignació gran
+# process used to isolate a webpage from other web pages
+# to improve security
+process-type-webisolated = Contingut web aïllat
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/toolkit/toolkit/printing/printPreview.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/toolkit/toolkit/printing/printPreview.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ca/toolkit/toolkit/printing/printPreview.ftl	2019-09-13 05:15:15.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ca/toolkit/toolkit/printing/printPreview.ftl	2019-09-15 11:35:15.000000000 +0000
@@ -25,14 +25,15 @@
 printpreview-shrink-to-fit =
     .label = Encongeix per ajustar
 printpreview-custom =
-    .label = Personalitza…
+    .label = Personalitzada…
 printpreview-print =
     .label = Imprimeix…
     .accesskey = p
 printpreview-of =
     .value = de
 printpreview-custom-prompt =
-    .value = Personalitza l'escala…
+    .value = Escala personalitzada…
+printpreview-custom-scale-prompt-title = Escala personalitzada
 printpreview-page-setup =
     .label = Configuració de la pàgina…
     .accesskey = g
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/cs/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/cs/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/cs/browser/chrome/browser/browser.dtd	2019-09-13 05:15:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/cs/browser/chrome/browser/browser.dtd	2019-09-15 11:35:25.000000000 +0000
@@ -76,12 +76,19 @@
 <!ENTITY menubarCmd.label "Hlavní nabídka">
 <!ENTITY menubarCmd.accesskey "H">
 <!ENTITY navbarCmd.label "Navigační lišta">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
 <!ENTITY personalbarCmd.label "Lišta záložek">
 <!ENTITY personalbarCmd.accesskey "z">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
 <!ENTITY bookmarksToolbarItem.label "Záložky nástrojové lišty">
 
 <!ENTITY pageSourceCmd.label "Zdrojový kód stránky">
 <!ENTITY pageSourceCmd.accesskey "j">
+
 <!ENTITY pageSourceCmd.commandkey "u">
 <!-- LOCALIZATION NOTE (pageSourceCmd.SafariCommandKey should match the
 Option+Command keyboard shortcut letter that Safari and Chrome use for "View
@@ -92,6 +99,7 @@
 
 <!ENTITY pageInfoCmd.label "Informace o stránce">
 <!ENTITY pageInfoCmd.accesskey "I">
+
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY ldbCmd.label "Debugger rozložení">
 <!ENTITY ldbCmd.accesskey "l">
@@ -117,6 +125,8 @@
 <!ENTITY fxaUnverified.label "Ověřte svůj účet">
 
 
+ <!-- } is above this key on many keyboards -->
+
 <!ENTITY fullScreenMinimize.tooltip "Minimalizovat">
 <!ENTITY fullScreenRestore.tooltip "Obnovit">
 <!ENTITY fullScreenClose.tooltip "Zavřít">
@@ -145,6 +155,10 @@
      followed by the user's email. -->
 <!ENTITY fxa.menu.signedInAs.label "Přihlášen(a) jako">
 <!ENTITY fxa.menu.manageAccount.label "Správa účtu…">
+
+<!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
+     for the Firefox Account toolbar menu screen. The `Signed in as` text is
+     followed by the user's email. -->
 <!ENTITY fxa.menu.syncSettings.label "Nastavení synchronizace…">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Připojit další zařízení…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
@@ -195,6 +209,7 @@
 
 <!ENTITY bookmarksMenu.label "Záložky">
 <!ENTITY bookmarksMenu.accesskey "o">
+
 <!ENTITY bookmarkThisPageCmd.label "Přidat stránku do záložek">
 <!ENTITY editThisBookmarkCmd.label "Upravit záložku">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -510,6 +525,7 @@
      This is set as the aria-label attribute for the search input box in the
      in-content search UI, to be used by screen readers. -->
 <!ENTITY contentSearchInput.label     "Vyhledávací dotaz">
+
 <!ENTITY contentSearchSubmit.tooltip  "Potvrdí hledání">
 
 <!-- LOCALIZATION NOTE (searchInput.placeholder):
@@ -972,6 +988,8 @@
 <!ENTITY contentBlocking.cookies.label "Cookies">
 <!ENTITY contentBlocking.cookiesView.label "Cookies a data stránek">
 
+<!ENTITY contentBlocking.manageSettings2.accesskey "N">
+
 <!ENTITY contentBlocking.socialblock.label "Sledující prvky sociálních sítí">
 
 <!ENTITY contentBlocking.cookies2.label "Sledovací cookies">
@@ -986,6 +1004,7 @@
 <!ENTITY contentBlocking.breakageReportView.label "Nahlásit problémy">
 <!ENTITY contentBlocking.breakageReportView2.description "Blokování obsahu může způsobovat problémy na některých stránkách. Jejich nahlášením významně pomůžete aplikaci &brandShortName; dále vylepšovat. S vaším hlášením se Mozille odešle URL stránky a informace o vašem nastavení blokování obsahu.">
 <!ENTITY contentBlocking.breakageReportView.learnMore "Zjistit více">
+
 <!ENTITY contentBlocking.breakageReportView.title "Nahlásit nefunkční stránku">
 <!ENTITY contentBlocking.breakageReportView3.description "Blokování sledovacích prvků může na některých stránkách způsobovat problémy. Jejich nahlášením významně pomůžete aplikaci &brandShortName; dále vylepšovat. S vaším hlášením se Mozille odešle URL stránky a informace o vašem nastavení blokování obsahu.">
 <!ENTITY contentBlocking.breakageReportView2.learnMore "Zjistit více">
@@ -1041,6 +1060,7 @@
 <!ENTITY newTabControlled.disableButton.accesskey "Z">
 
 <!ENTITY homepageControlled.message "Rozšíření změnilo obsah zobrazovaný na vaší domovské stránce. Pokud tuto změnu nechcete, můžete obnovit svoje původní nastavení.">
+
 <!ENTITY homepageControlled.header.message "Vaše domovská stránka byla změněna.">
 <!ENTITY homepageControlled.keepButton.label "Zachovat změny">
 <!ENTITY homepageControlled.keepButton.accesskey "Z">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/cs/toolkit/toolkit/about/aboutAddons.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/cs/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/cs/toolkit/toolkit/about/aboutAddons.ftl	2019-09-13 05:15:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/cs/toolkit/toolkit/about/aboutAddons.ftl	2019-09-15 11:35:25.000000000 +0000
@@ -362,7 +362,7 @@
 
 # Variables:
 #   $addon (string) - Name of the add-on
-pending-uninstall-description = Doplněk <span data-l10n-name="addon-name">{ $addon }</span> byl odstraněn.
+pending-uninstall-description = Doplněk <span data-l10n-name="addon-name">{ $addon }</span> byl z aplikace odebrán.
 pending-uninstall-undo-button = Vrátit zpět
 addon-detail-updates-label = Automatické aktualizace
 addon-detail-updates-radio-default = Výchozí nastavení
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/cs/toolkit/toolkit/global/processTypes.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/cs/toolkit/toolkit/global/processTypes.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/cs/toolkit/toolkit/global/processTypes.ftl	2019-09-13 05:15:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/cs/toolkit/toolkit/global/processTypes.ftl	2019-09-15 11:35:25.000000000 +0000
@@ -18,6 +18,9 @@
 # process used to isolate webpages that requested special
 # permission to allocate large amounts of memory
 process-type-weblargeallocation = Velká alokace paměti
+# process used to isolate a webpage from other web pages
+# to improve security
+process-type-webisolated = Izolovaný webový obsah
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/cy/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/cy/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/cy/browser/browser/preferences/preferences.ftl	2019-09-13 05:15:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/cy/browser/browser/preferences/preferences.ftl	2019-09-15 11:35:30.000000000 +0000
@@ -778,7 +778,7 @@
 
 
 
-content-blocking-etp-standard-desc = Yn gytbwys ar gyfer diogelwch a pherfformiad. Bydd tudalennau'n llwytho'n arferol.
+content-blocking-etp-standard-desc = Cydbwysedd rhwng diogelwch a pherfformiad. Bydd tudalennau'n llwytho fel arfer.
 content-blocking-etp-strict-desc = Diogelwch cryfach, ond gall achosi i rai gwefannau neu gynnwys dorri.
 content-blocking-etp-custom-desc = Dewiswch pa dracwyr a sgriptiau i'w rhwystro.
 content-blocking-private-windows = Tracio cynnwys mewn Ffenestri Preifat
@@ -794,7 +794,7 @@
 content-blocking-warning-title = Rhybudd!
 content-blocking-warning-description = Gall rhwystro cynnwys achosi i rai gwefannau dorri. Mae'n hawdd i analluogi rhwystro gwefannau rydych chi'n ymddiried ynddyn nhw.
 content-blocking-learn-how = Dysgu sut
-content-blocking-etp-warning-description = Gall rhwystro tracwyr effeithio ar ymarferoldeb rhai gwefannau. Ail-lwytho tudalen gyda thracwyr i lwytho'r holl gynnwys.
+content-blocking-etp-warning-description = Gall rhwystro tracwyr effeithio ar ymarferoldeb rhai gwefannau. Ail-lwythwch dudalen gyda thracwyr i lwytho'r holl gynnwys.
 content-blocking-warning-learn-how = Dysgu sut
 content-blocking-reload-description = Bydd angen ail lwytho'ch tabiau i osod y newidiadau hyn.
 content-blocking-reload-tabs-button =
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/browser/browser/newtab/asrouter.ftl	2019-09-13 05:15:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/browser/browser/newtab/asrouter.ftl	2019-09-15 11:35:36.000000000 +0000
@@ -157,3 +157,16 @@
 cfr-doorhanger-firefox-send-body = Hold dine fortrolige dokumenter sikre med stærk kryptering og et link, der automatisk udløber
 cfr-doorhanger-firefox-send-ok-button = Prøv { -send-brand-name }
   .accesskey = P
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Se beskyttelse
+  .accesskey = b
+cfr-doorhanger-socialtracking-close-button = Luk
+  .accesskey = L
+cfr-doorhanger-socialtracking-heading = { -brand-short-name } forhindrede et socialt netværk i at spore dig på denne side
+cfr-doorhanger-socialtracking-description = Du har ret til et privatliv. { -brand-short-name } blokerer nu de mest almindelige sporings-mekanismer fra sociale medier for at begrænse, hvor meget data de kan indsamle om din adfærd på nettet. 
+cfr-doorhanger-fingerprinters-heading = { -brand-short-name } blokerede en fingerprinter på denne side
+cfr-doorhanger-fingerprinters-description = Du har ret til et privatliv. { -brand-short-name } blokerer nu fingerprinters, der indsamler unikke informationer om din enhed for at spore dig.
+cfr-doorhanger-cryptominers-heading = { -brand-short-name } blokerede en cryptominer på denne side
+cfr-doorhanger-cryptominers-description = Du har ret til et privatliv. { -brand-short-name } blokerer nu cryptominers, der bruger dit systems ressourcer til at udvinde digital valuta.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/browser/browser/preferences/preferences.ftl	2019-09-13 05:15:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/browser/browser/preferences/preferences.ftl	2019-09-15 11:35:36.000000000 +0000
@@ -935,6 +935,21 @@
 content-blocking-private-trackers = Kendte sporings-tjenester kun i private vinduer
 content-blocking-third-party-cookies = Sporings-cookies fra tredjepart
 
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
+# "Standard" in this case is an adjective, meaning "default" or "normal".
+enhanced-tracking-protection-setting-standard =
+  .label = Standard
+  .accesskey = d
+enhanced-tracking-protection-setting-strict =
+  .label = Striks
+  .accesskey = r
+enhanced-tracking-protection-setting-custom =
+  .label = Tilpasset
+  .accesskey = T
+##
+
 content-blocking-etp-standard-desc = Balanceret mellem beskyttelse og ydelse. Sider indlæses som normalt.
 content-blocking-etp-strict-desc = Bedre beskyttelse, men kan forhindre nogle websteder i at fungere.
 content-blocking-etp-custom-desc = Vælg selv, hvilke sporings-tjenester og scripts der skal blokeres.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/browser/chrome/browser/browser.dtd	2019-09-13 05:15:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/browser/chrome/browser/browser.dtd	2019-09-15 11:35:36.000000000 +0000
@@ -991,6 +991,8 @@
 <!ENTITY contentBlocking.cookies.label "Cookies">
 <!ENTITY contentBlocking.cookiesView.label "Cookies og websteds-data">
 
+<!ENTITY contentBlocking.manageSettings2.accesskey "H">
+
 <!ENTITY contentBlocking.socialblock.label "Sporing via sociale medier">
 
 <!ENTITY contentBlocking.cookies2.label "Sporings-cookies på tværs af websteder">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/devtools/client/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/devtools/client/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/devtools/client/debugger.properties	2019-09-13 05:15:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/devtools/client/debugger.properties	2019-09-15 11:35:36.000000000 +0000
@@ -218,10 +218,6 @@
 # source.
 blackboxCheckboxTooltip2=Slå black boxing til eller fra
 
-# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
-# DOM Mutation Breakpoints pane when there are no events.
-noDomMutationBreakpointsText=Ingen breakpoints at vise
-
 # LOCALIZATION NOTE (noDomMutationBreakpoints): The text to
 # display in the DOM Mutation Breakpoints pane when there are no events.
 # %S will be replaced by an active link using inspectorTool as text
@@ -230,6 +226,14 @@
 # LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
 inspectorTool=Inspektør
 
+# LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
+# the event search input bar
+eventListenersHeader1.placeholder=Filtrer efter event-type
+
+# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
+# DOM Mutation Breakpoints pane when there are no events.
+noDomMutationBreakpointsText=Ingen breakpoints at vise
+
 # LOCALIZATION NOTE (domMutationHeader): The text to display in the
 # DOM Mutation Breakpoints header
 domMutationHeader=Breakpoints for DOM-ændringer
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/devtools/client/toolbox.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/devtools/client/toolbox.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/devtools/client/toolbox.properties	2019-09-13 05:15:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/devtools/client/toolbox.properties	2019-09-15 11:35:36.000000000 +0000
@@ -289,6 +289,18 @@
 # shown in the web replay timeline marker
 toolbox.replay.jumpMessage2=Hop til %1$S
 
+# LOCALIZATION NOTE (toolbox.replay.resume): This is the text that appears in the
+# Replay command bar to prompt the user to resume the program.
+toolbox.replay.resume=Fortsæt
+
+# LOCALIZATION NOTE (toolbox.replay.rewind): This is the text that appears in the
+# Replay command bar to prompt the user to rewind the program.
+toolbox.replay.rewind=Spol tilbage
+
+# LOCALIZATION NOTE (toolbox.replay.pause): This is the text that appears in the
+# Replay command bar to prompt the user to pause the program.
+toolbox.replay.pause=Pause
+
 # LOCALIZATION NOTE (toolbox.debugTargetErrorPage.title): This is the title
 # for the Error view shown by the toolbox when a connection to a debug target
 # could not be made
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/dom/chrome/security/csp.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/dom/chrome/security/csp.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/dom/chrome/security/csp.properties	2019-09-13 05:15:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/dom/chrome/security/csp.properties	2019-09-15 11:35:36.000000000 +0000
@@ -96,6 +96,11 @@
 # %2$S is the name of the directive that causes the src to be ignored.
 IgnoringSrcBecauseOfDirective=Ignorerer '%1$S' på grund af direktivet '%2$S'.
 
+# LOCALIZATION NOTE (IgnoringSourceWithinDirective):
+# %1$S is the ignored src
+# %2$S is the directive  which supports src
+IgnoringSourceWithinDirective = Ignorerer kilden "%1$S" (understøttes ikke inden for '%2$S').
+
 # CSP Errors:
 # LOCALIZATION NOTE (couldntParseInvalidSource):
 # %1$S is the source that could not be parsed
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/toolkit/toolkit/about/certviewer.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:35:36.000000000 +0000
@@ -0,0 +1,57 @@
+# 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/.
+
+certificate-viewer-certificate-section-title = Certifikat
+
+## Error messages
+
+certificate-viewer-error-message = Vi kunne ikke finde information om certifikatet - eller certifikatet er fejlbehæftet. Prøv igen.
+certificate-viewer-error-title = Noget gik galt.
+
+## Certificate information labels
+
+certificate-viewer-algorithm = Algoritme
+certificate-viewer-certificate-authority = Certifikatautoritet
+certificate-viewer-cipher-suite = Cipher suite
+certificate-viewer-common-name = Normalt navn
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-country = Virksomhedens hjemland
+certificate-viewer-country = Land
+certificate-viewer-curve = Kurve
+certificate-viewer-distribution-point = Distributions-punkt
+certificate-viewer-dns-name = DNS-navn
+certificate-viewer-exponent = Eksponent
+certificate-viewer-id = ID
+certificate-viewer-key-exchange-group = Nøgleudvekslingsgruppe
+certificate-viewer-key-id = Nøgle-ID
+certificate-viewer-key-size = Nøgle-størrelse
+certificate-viewer-locality = Lokalitet
+certificate-viewer-location = Placering
+certificate-viewer-logid = Log-ID
+certificate-viewer-method = Metode
+certificate-viewer-modulus = Modulus
+certificate-viewer-name = Navn
+certificate-viewer-not-after = Ikke efter
+certificate-viewer-not-before = Ikke før
+certificate-viewer-organization = Organisation
+certificate-viewer-organizational-unit = Organisatorisk enhed
+certificate-viewer-policy = Politik
+certificate-viewer-protocol = Protokol
+certificate-viewer-public-value = Offentlig værdi
+certificate-viewer-purposes = Formål
+certificate-viewer-qualifier = Qualifier
+certificate-viewer-qualifiers = Qualifiers
+certificate-viewer-required = Påkrævet
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-state-province = Virkomhedens hjem-stat/-provins
+certificate-viewer-state-province = Stat/provins
+certificate-viewer-sha-1 = SHA-1
+certificate-viewer-sha-256 = SHA-256
+certificate-viewer-serial-number = Serienummer
+certificate-viewer-signature-algorithm = Signatur-algoritme
+certificate-viewer-signature-scheme = Signatur-skema
+certificate-viewer-timestamp = Tidsstempel
+certificate-viewer-value = Værdi
+certificate-viewer-version = Version
+certificate-viewer-business-category = Virksomheds-kategori
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/toolkit/toolkit/global/processTypes.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/toolkit/toolkit/global/processTypes.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/da/toolkit/toolkit/global/processTypes.ftl	2019-09-13 05:15:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/da/toolkit/toolkit/global/processTypes.ftl	2019-09-15 11:35:36.000000000 +0000
@@ -25,6 +25,10 @@
 # permission to allocate large amounts of memory
 process-type-weblargeallocation = Stor allokering
 
+# process used to isolate a webpage from other web pages
+# to improve security
+process-type-webisolated = Isoleret web-indhold
+
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/chrome/global/textcontext.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/chrome/global/textcontext.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/chrome/global/textcontext.dtd	2019-09-13 05:15:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/chrome/global/textcontext.dtd	2019-09-15 11:35:44.000000000 +0000
@@ -31,6 +31,8 @@
 <!ENTITY fillLoginMenu.accesskey      "Z">
 <!ENTITY fillSuggestedPassword.label  "Passwort erzeugen und verwenden">
 <!ENTITY fillSuggestedPassword.accesskey "e">
+<!ENTITY fillGeneratedPassword.label  "Sicher erzeugtes Passwort verwenden">
+<!ENTITY fillGeneratedPassword.accesskey "S">
 <!ENTITY fillPasswordMenu.label       "Passwort einfügen">
 <!ENTITY fillPasswordMenu.accesskey   "P">
 <!ENTITY fillUsernameMenu.label       "Benutzernamen einfügen">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/chrome/passwordmgr/passwordmgr.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/chrome/passwordmgr/passwordmgr.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/chrome/passwordmgr/passwordmgr.properties	2019-09-13 05:15:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/chrome/passwordmgr/passwordmgr.properties	2019-09-15 11:35:44.000000000 +0000
@@ -17,6 +17,7 @@
 saveLoginButtonNever.accesskey = e
 updateLoginMsg = Sollen diese Zugangsdaten aktualisiert werden?
 updateLoginMsgNoUser = Soll dieses Passwort aktualisiert werden?
+updateLoginMsgAddUsername = Soll zu dem gespeicherten Passwort ein Benutzername hinzugefügt werden?
 updateLoginButtonText = Aktualisieren
 updateLoginButtonAccessKey = k
 updateLoginButtonDeny.label = Nicht aktualisieren
@@ -69,6 +70,9 @@
 # Shown in the autocomplete popup to allow filling a generated password into a password field.
 useGeneratedPassword=Erzeugtes Passwort verwenden
 
+# LOCALIZATION NOTE (useASecurelyGeneratedPassword):
+# Shown in the autocomplete popup to allow filling a generated password into a password field.
+useASecurelyGeneratedPassword=Sicher erzeugtes Passwort verwenden
 # LOCALIZATION NOTE (loginHostAge):
 # This is used to show the context menu login items with their age.
 # 1st string is the username for the login, 2nd is the login's age.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/toolkit/about/aboutAddons.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/toolkit/about/aboutAddons.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/toolkit/about/aboutAddons.ftl	2019-09-13 05:15:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/toolkit/about/aboutAddons.ftl	2019-09-15 11:35:44.000000000 +0000
@@ -106,9 +106,15 @@
 # cannot be overridden by the user.
 detail-private-disallowed-label = In privaten Fenstern nicht erlaubt
 detail-private-disallowed-description = Die Erweiterung wird im Privaten Modus nicht ausgeführt. <label data-l10n-name="detail-private-browsing-learn-more">Weitere Informationen</label>
+
+detail-private-disallowed-description2 = Die Erweiterung wird im Privaten Modus nicht ausgeführt. <a data-l10n-name="learn-more">Weitere Informationen</a>
+
 # Some special add-ons are privileged, run in private windows automatically, and this permission can't be revoked
 detail-private-required-label = Benötigt Zugriff auf private Fenster
 detail-private-required-description = Die Erweiterung hat Zugriff auf Ihre Online-Aktivitäten im Privaten Modus. <label data-l10n-name="detail-private-browsing-learn-more">Weitere Informationen</label>
+
+detail-private-required-description2 = Die Erweiterung hat Zugriff auf Ihre Online-Aktivitäten im Privaten Modus. <a data-l10n-name="learn-more">Weitere Informationen</a>
+
 detail-private-browsing-on =
     .label = Erlauben
     .tooltiptext = Aktivieren im privaten Modus
@@ -252,14 +258,25 @@
 shortcuts-no-commands = Folgende Erweiterungen verfügen über keine Tastenkombinationen:
 shortcuts-input =
     .placeholder = Tastenkombination drücken
+
 shortcuts-browserAction = Aktion für Erweiterung aktivieren
 shortcuts-pageAction = Aktion für Seite aktivieren
 shortcuts-sidebarAction = Sidebar umschalten
+
 shortcuts-modifier-mac = Mit Strg-, Alt- oder ⌘-Taste kombinieren
 shortcuts-modifier-other = Mit Strg- oder Alt-Taste kombinieren
 shortcuts-invalid = Ungültige Kombination
 shortcuts-letter = Zeichen eingeben
 shortcuts-system = { -brand-short-name }-Tastenkombinationen können nicht überschrieben werden.
+
+# String displayed in warning label when there is a duplicate shortcut
+shortcuts-duplicate = Doppelt verwendete Tastenkombination
+
+# String displayed when a keyboard shortcut is already assigned to more than one add-on
+# Variables:
+#   $shortcut (string) - Shortcut string for the add-on
+shortcuts-duplicate-warning-message = { $shortcut } wird mehrmals als Tastenkombination verwendet. Dies kann zu unerwartetem Verhalten führen.
+
 # String displayed when a keyboard shortcut is already used by another add-on
 # Variables:
 #   $addon (string) - Name of the add-on
@@ -308,6 +325,11 @@
 manage-addon-button = Verwalten
 find-more-addons = Mehr Add-ons ansehen
 
+# This is a label for the button to open the "more options" menu, it is only
+# used for screen readers.
+addon-options-button =
+    .aria-label = Weitere Optionen
+
 ## Add-on actions
 
 report-addon-button = Melden
@@ -325,9 +347,25 @@
 release-notes-addon-button = Versionshinweise
 permissions-addon-button = Berechtigungen
 
+
 addons-enabled-heading = Aktiviert
 addons-disabled-heading = Deaktiviert
 
+extension-enabled-heading = Aktiviert
+extension-disabled-heading = Deaktiviert
+
+theme-enabled-heading = Aktiviert
+theme-disabled-heading = Deaktiviert
+
+plugin-enabled-heading = Aktiviert
+plugin-disabled-heading = Deaktiviert
+
+dictionary-enabled-heading = Aktiviert
+dictionary-disabled-heading = Deaktiviert
+
+locale-enabled-heading = Aktiviert
+locale-disabled-heading = Deaktiviert
+
 ask-to-activate-button = Nachfragen, ob aktiviert werden soll
 always-activate-button = Immer aktivieren
 never-activate-button = Nie aktivieren
@@ -377,6 +415,12 @@
 # badge is the private browsing icon included next to the extension's name.
 addon-badge-private-browsing-allowed =
     .title = In privaten Fenstern erlaubt
+
+# This is the tooltip text for the private browsing badge in about:addons. The
+# badge is the private browsing icon included next to the extension's name.
+addon-badge-private-browsing-allowed2 =
+    .title = In privaten Fenstern erlaubt
+    .aria-label = { addon-badge-private-browsing-allowed2.title }
 addon-detail-private-browsing-help = Falls erlaubt, hat die Erweiterung Zugriff auf Ihre Online-Aktivitäten im Privaten Modus. <a data-l10n-name="learn-more">Weitere Informationen</a>
 addon-detail-private-browsing-allow = Erlauben
 addon-detail-private-browsing-disallow = Nicht erlauben
@@ -387,6 +431,12 @@
   .title = Empfohlen
   .alt = Empfohlen
 
+# This is the tooltip text for the recommended badge for an extension in about:addons. The
+# badge is a small icon displayed next to an extension when it is recommended on AMO.
+addon-badge-recommended2 =
+  .title = { -brand-product-name } empfiehlt nur Erweiterungen, die unsere Standards für Sicherheit und Leistung erfüllen.
+  .aria-label = { addon-badge-recommended2.title }
+
 available-updates-heading = Verfügbare Updates
 recent-updates-heading = Kürzlich durchgeführte Updates
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/toolkit/about/aboutNetworking.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/toolkit/about/aboutNetworking.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/toolkit/about/aboutNetworking.ftl	2019-09-13 05:15:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/toolkit/about/aboutNetworking.ftl	2019-09-15 11:35:44.000000000 +0000
@@ -57,3 +57,12 @@
 rcwn-std-dev-long = Standardabweichung Durchschnitt lang
 rcwn-cache-slow = Anzahl Cache langsam
 rcwn-cache-not-slow = Anzahl Cache nicht langsam
+networkid = Netzwerk-ID
+networkid-id = Netzwerk-ID
+
+## Link is intended as "network link"
+
+networkid-isUp = Verbindung (Link) bestätigt
+networkid-statusKnown = Status der Verbindung (Link) bekannt
+
+##
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/toolkit/about/aboutTelemetry.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/toolkit/about/aboutTelemetry.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/toolkit/about/aboutTelemetry.ftl	2019-09-13 05:15:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/toolkit/about/aboutTelemetry.ftl	2019-09-15 11:35:44.000000000 +0000
@@ -4,6 +4,7 @@
 
 about-telemetry-ping-data-source = Datensatz auswählen:
 about-telemetry-show-current-ping-data = Datensatz in Aufzeichnung
+about-telemetry-show-current-data = Datensatz in Aufzeichnung
 about-telemetry-show-archived-ping-data = Archivierte Datensätze
 about-telemetry-show-subsession-data = Untersitzungsdaten anzeigen
 about-telemetry-choose-ping = Datensatz auswählen:
@@ -76,6 +77,7 @@
 #   $timeStamp (String): ping localized timestamp, e.g. “2017/07/08 10:40:46”
 about-telemetry-ping-details = Jede Information wird als "<a data-l10n-name="ping-link">Datensatz</a>" verpackt gesendet. Dies ist der Datensatz { $name }, { $timestamp }.
 about-telemetry-ping-details-current = Jede Information wird als "<a data-l10n-name="ping-link">Datensatz</a>" verpackt gesendet. Dies ist der aktuelle Datensatz.
+about-telemetry-data-details-current = Jede Information wird als "<a data-l10n-name="ping-link">Datensatz</a>" verpackt gesendet. Dies ist der aktuelle Datensatz.
 # string used as a placeholder for the search field
 # More info about it can be found here:
 # https://firefox-source-docs.mozilla.org/toolkit/components/telemetry/telemetry/data/main-ping.html
@@ -102,6 +104,8 @@
 about-telemetry-no-data-to-display = Keine Daten in "{ $sectionName }" vorhanden
 # used as a tooltip for the “current” ping title in the sidebar
 about-telemetry-current-ping-sidebar = aktueller Datensatz
+# used as a tooltip for the “current” ping title in the sidebar
+about-telemetry-current-data-sidebar = aktueller Datensatz
 # used in the “Ping Type” select
 about-telemetry-telemetry-ping-type-all = alle
 # button label to copy the histogram
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/toolkit/printing/printPreview.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/toolkit/printing/printPreview.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/de/toolkit/toolkit/printing/printPreview.ftl	2019-09-13 05:15:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/de/toolkit/toolkit/printing/printPreview.ftl	2019-09-15 11:35:44.000000000 +0000
@@ -33,6 +33,7 @@
     .value = von
 printpreview-custom-prompt =
     .value = Benutzerdefinierte Skalierung…
+printpreview-custom-scale-prompt-title = Benutzerdefinierte Skalierung
 printpreview-page-setup =
     .label = Seite einrichten…
     .accesskey = e
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/el/browser/browser/menubar.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/el/browser/browser/menubar.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/el/browser/browser/menubar.ftl	2019-09-13 05:15:38.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/el/browser/browser/menubar.ftl	2019-09-15 11:35:52.000000000 +0000
@@ -153,7 +153,7 @@
     .label = Πλήρης οθόνη
     .accesskey = Π
 
-##
+
 
 menu-view-show-all-tabs =
     .label = Προβολή όλων των καρτελών
@@ -190,7 +190,7 @@
 menu-bookmarks-show-all =
     .label = Προβολή όλων των σελιδοδεικτών
 menu-bookmarks-all-tabs =
-    .label = Προσθήκη όλων των καρτελών στους σελιδοδείκτες…
+    .label = Αποθήκευση όλων των καρτελών…
 menu-bookmarks-toolbar =
     .label = Γραμμή σελιδοδεικτών
 menu-bookmarks-other =
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/el/browser/browser/tabContextMenu.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/el/browser/browser/tabContextMenu.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/el/browser/browser/tabContextMenu.ftl	2019-09-13 05:15:38.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/el/browser/browser/tabContextMenu.ftl	2019-09-15 11:35:52.000000000 +0000
@@ -36,8 +36,8 @@
     .label = Ξεκαρφίτσωμα καρτελών
     .accesskey = λ
 bookmark-selected-tabs =
-    .label = Προσθήκη καρτελών στους σελιδοδείκτες…
-    .accesskey = κ
+    .label = Αποθήκευση καρτελών…
+    .accesskey = Α
 bookmark-tab =
     .label = Αποθήκευση καρτέλας
     .accesskey = Α
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/el/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/el/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/el/browser/chrome/browser/browser.dtd	2019-09-13 05:15:38.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/el/browser/chrome/browser/browser.dtd	2019-09-15 11:35:52.000000000 +0000
@@ -76,12 +76,20 @@
 <!ENTITY menubarCmd.label "Γραμμή μενού">
 <!ENTITY menubarCmd.accesskey "μ">
 <!ENTITY navbarCmd.label "Γραμμή πλοήγησης">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
 <!ENTITY personalbarCmd.label "Γραμμή σελιδοδεικτών">
 <!ENTITY personalbarCmd.accesskey "γ">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
+<!ENTITY personalbar.accessibleLabel "Σελιδοδείκτες">
 <!ENTITY bookmarksToolbarItem.label "Στοιχεία γραμμής σελιδοδεικτών">
 
 <!ENTITY pageSourceCmd.label "Κώδικας σελίδας">
 <!ENTITY pageSourceCmd.accesskey "δ">
+
 <!ENTITY pageSourceCmd.commandkey "u">
 <!-- LOCALIZATION NOTE (pageSourceCmd.SafariCommandKey should match the
 Option+Command keyboard shortcut letter that Safari and Chrome use for "View
@@ -92,6 +100,7 @@
 
 <!ENTITY pageInfoCmd.label "Πληροφορίες σελίδας">
 <!ENTITY pageInfoCmd.accesskey "λ">
+
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY ldbCmd.label "Αποσφαλμάτωση διάταξης">
 <!ENTITY ldbCmd.accesskey "Δ">
@@ -117,6 +126,8 @@
 <!ENTITY fxaUnverified.label "Επαλήθευση του λογαριασμού σας">
 
 
+ <!-- } is above this key on many keyboards -->
+
 <!ENTITY fullScreenMinimize.tooltip "Ελαχιστοποίηση">
 <!ENTITY fullScreenRestore.tooltip "Επαναφορά">
 <!ENTITY fullScreenClose.tooltip "Κλείσιμο">
@@ -143,6 +154,10 @@
      followed by the user's email. -->
 <!ENTITY fxa.menu.signedInAs.label "Σε σύνδεση ως">
 <!ENTITY fxa.menu.manageAccount.label "Διαχείριση λογαριασμού…">
+
+<!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
+     for the Firefox Account toolbar menu screen. The `Signed in as` text is
+     followed by the user's email. -->
 <!ENTITY fxa.menu.syncSettings.label "Ρυθμίσεις &syncBrand.shortName.label;…">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Σύνδεση άλλης συσκευής…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
@@ -192,11 +207,12 @@
 
 <!ENTITY bookmarksMenu.label "Σελιδοδείκτες">
 <!ENTITY bookmarksMenu.accesskey "Σ">
+
 <!ENTITY bookmarkThisPageCmd.label "Προσθήκη στους σελιδοδείκτες">
 <!ENTITY editThisBookmarkCmd.label "Επεξεργασία σελιδοδείκτη">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
 
-<!ENTITY addCurPagesCmd.label "Προσθήκη όλων των καρτελών στους σελιδοδείκτες…">
+<!ENTITY addCurPagesCmd.label "Αποθήκευση όλων των καρτελών…">
 
 <!ENTITY showAllBookmarks2.label "Προβολή όλων των σελιδοδεικτών">
 <!ENTITY recentBookmarks.label "Πρόσφατοι σελιδοδείκτες">
@@ -506,6 +522,7 @@
      This is set as the aria-label attribute for the search input box in the
      in-content search UI, to be used by screen readers. -->
 <!ENTITY contentSearchInput.label     "Ερώτημα αναζήτησης">
+
 <!ENTITY contentSearchSubmit.tooltip  "Υποβολή αναζήτησης">
 
 <!-- LOCALIZATION NOTE (searchInput.placeholder):
@@ -947,6 +964,7 @@
 
 
 
+
 <!ENTITY contentBlocking.cryptominers.label "Εξορύκτες κρυπτονομισμάτων">
 <!ENTITY contentBlocking.cryptominersView.label "Εξορύκτες κρυπτονομισμάτων">
 
@@ -957,6 +975,7 @@
 <!ENTITY contentBlocking.breakageReportView.label "Αναφορά προβλημάτων">
 <!ENTITY contentBlocking.breakageReportView2.description "Η Φραγή περιεχομένου μπορεί να προκαλέσει προβλήματα με ορισμένες ιστοσελίδες. Όταν αναφέρετε προβλήματα, θα βοηθήσετε στη βελτίωση του &brandShortName; για όλους. (Θα αποσταλεί ένα URL, καθώς και πληροφορίες για τις ρυθμίσεις του προγράμματος περιήγησής σας στη Mozilla.)">
 <!ENTITY contentBlocking.breakageReportView.learnMore "Μάθετε περισσότερα">
+
 <!ENTITY contentBlocking.breakageReportView2.learnMore "Μάθετε περισσότερα">
 <!ENTITY contentBlocking.breakageReportView.collection.url.label "URL">
 <!ENTITY contentBlocking.breakageReportView.collection.comments.label "Τι προβλήματα αντιμετωπίσατε; (Προαιρετικό)">
@@ -1010,6 +1029,7 @@
 <!ENTITY newTabControlled.disableButton.accesskey "Α">
 
 <!ENTITY homepageControlled.message "Μια επέκταση έχει αλλάξει αυτό που βλέπετε ως αρχική σελίδα. Μπορείτε να επαναφέρετε τις ρυθμίσεις σας αν δεν θέλετε αυτή την αλλαγή.">
+
 <!ENTITY homepageControlled.header.message "Η αρχική σας σελίδα έχει αλλάξει.">
 <!ENTITY homepageControlled.keepButton.label "Διατήρηση αλλαγών">
 <!ENTITY homepageControlled.keepButton.accesskey "Δ">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/el/browser/chrome/browser/browser.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/el/browser/chrome/browser/browser.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/el/browser/chrome/browser/browser.properties	2019-09-13 05:15:38.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/el/browser/chrome/browser/browser.properties	2019-09-15 11:35:52.000000000 +0000
@@ -50,6 +50,7 @@
 # the administration can add to the message.
 addonInstallBlockedByPolicy=Το %1$S (%2$S) έχει αποκλειστεί από το διαχειριστή του συστήματός σας.%3$S
 
+
 # LOCALIZATION NOTE (webextPerms.header)
 # This string is used as a header in the webextension permissions dialog,
 # %S is replaced with the localized name of the extension being installed.
@@ -404,7 +405,7 @@
 # %S is the keyboard shortcut for "Show All Bookmarks"
 bookmarksMenuButton.tooltip=Εμφάνιση των σελιδοδεικτών σας (%S)
 # Star button
-starButtonOn.tooltip2=Επεξεργασία αυτού του σελιδοδείκτη (%S)
+starButtonOn.tooltip2=Επεξεργασία σελιδοδείκτη (%S)
 starButtonOff.tooltip2=Προσθήκη στους σελιδοδείκτες (%S)
 
 # Downloads button tooltip
@@ -479,7 +480,7 @@
 # %S is the hostname of the site that is being displayed.
 identity.headerWithHost=Πληροφορίες ιστοσελίδας για %S
 
-# LOCALIZATION NOTE (identity.headerMainWithHost):
+# LOCALIZATION NOTE (identity.headerMainWithHost, identity.headerSecurityWithHost):
 # %S is the hostname of the site that is being displayed.
 identity.headerMainWithHost=Πληροφορίες ιστοσελίδας για %S
 identity.identified.verifier=Επαληθεύτηκε από: %S
@@ -695,7 +696,7 @@
 
 # Edit Bookmark UI
 editBookmarkPanel.newBookmarkTitle=Νέος σελιδοδείκτης
-editBookmarkPanel.editBookmarkTitle=Επεξεργασία αυτού του σελιδοδείκτη
+editBookmarkPanel.editBookmarkTitle=Επεξεργασία σελιδοδείκτη
 editBookmarkPanel.cancel.label=Ακύρωση
 editBookmarkPanel.cancel.accesskey=Α
 
@@ -1096,6 +1097,7 @@
 
 permissions.remove.tooltip = Εκκαθάριση δικαιώματος και ερώτηση ξανά
 
+
 # LOCALIZATION NOTE (aboutDialog.architecture.*):
 # The sixtyFourBit and thirtyTwoBit strings describe the architecture of the
 # current Firefox build: 32-bit or 64-bit. These strings are used in parentheses
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/browser/browser/newtab/asrouter.ftl	2019-09-13 05:16:17.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/browser/browser/newtab/asrouter.ftl	2019-09-15 11:36:34.000000000 +0000
@@ -139,3 +139,16 @@
 cfr-doorhanger-firefox-send-body = Hâld jo gefoelige dokuminten wei fan nijsgjirrige blikken mei end-to-end-fersifering en in keppeling dy't ferdwynt as jo klear binne.
 cfr-doorhanger-firefox-send-ok-button = { -send-brand-name } probearje
     .accesskey = p
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Beskermingen besjen
+    .accesskey = B
+cfr-doorhanger-socialtracking-close-button = Slute
+    .accesskey = S
+cfr-doorhanger-socialtracking-heading = { -brand-short-name } hat opkeard dat in sosjaal netwurk jo hjir folget
+cfr-doorhanger-socialtracking-description = Jo privacy is wichtich. { -brand-short-name } blokkearret no faak brûkte sosjale-mediatrackers en beheint sa, hoefolle gegevens se sammelje oer wat jo online dogge.
+cfr-doorhanger-fingerprinters-heading = { -brand-short-name } hat in fingerprinter op dizze side blokkearre
+cfr-doorhanger-fingerprinters-description = Jo privacy is wichtich. { -brand-short-name } blokkearret no fingerprinters, dy't stikjes unyk identifisearbere ynformaasje oer jo apparaat sammelje om jo te folgjen.
+cfr-doorhanger-cryptominers-heading = { -brand-short-name } hat in cryptominer op dizze side blokkearre
+cfr-doorhanger-cryptominers-description = Jo privacy is wichtich. { -brand-short-name } blokkearret no cryptominers, dy't de kompjûterkrêft fan jo systeem brûke om digitaal jild te minen.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/browser/browser/preferences/preferences.ftl	2019-09-13 05:16:17.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/browser/browser/preferences/preferences.ftl	2019-09-15 11:36:34.000000000 +0000
@@ -725,8 +725,8 @@
 ## Privacy Section - Content Blocking
 
 content-blocking-header = Ynhâldsblokkearring
-content-blocking-enhanced-tracking-protection = Ferbettere beskerming tsjin folgjen
 content-blocking-section-description = Beskermje jo privacy wylst jo sneupe. Blokkearje ûnsichtbere ynhâld dy't de troch jo besochte websites folget en jo profilearje. Troch wat fan dizze ynhâld te blokkearjen lade siden mooglik flugger.
+content-blocking-enhanced-tracking-protection = Ferbettere beskerming tsjin folgjen
 content-blocking-section-top-level-description = Trackers folgje jo online om gegevens oer jo sneupgedrach en ynteresses te sammeljen. { -brand-short-name } blokkearret in protte fan dizze trackers en oare kweawollende skripts.
 content-blocking-learn-more = Mear ynfo
 # The terminology used to refer to categories of Content Blocking is also used in chrome/browser/browser.properties and should be translated consistently.
@@ -745,6 +745,23 @@
 content-blocking-custom-desc = Kies wat der blokkearre wurdt.
 content-blocking-private-trackers = Bekende trackers allinnich yn priveefinsters
 content-blocking-third-party-cookies = Tracking-cookies fan tredden
+
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
+# "Standard" in this case is an adjective, meaning "default" or "normal".
+enhanced-tracking-protection-setting-standard =
+    .label = Standert
+    .accesskey = S
+enhanced-tracking-protection-setting-strict =
+    .label = Strang
+    .accesskey = t
+enhanced-tracking-protection-setting-custom =
+    .label = Oanpast
+    .accesskey = O
+
+
+
 content-blocking-etp-standard-desc = Balansearre foar beskerming en prestaasjes. Siden lade normaal.
 content-blocking-etp-strict-desc = Sterkere beskerming, mar kin der foar soargje dat guon websites of ynhâld net wurkje.
 content-blocking-etp-custom-desc = Kies hokker trackers en scripts jo blokkearje wolle.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/browser/chrome/browser/browser.dtd	2019-09-13 05:16:17.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/browser/chrome/browser/browser.dtd	2019-09-15 11:36:34.000000000 +0000
@@ -991,6 +991,8 @@
 <!ENTITY contentBlocking.cookies.label "Cookies">
 <!ENTITY contentBlocking.cookiesView.label "Cookies en websitegegevens">
 
+<!ENTITY contentBlocking.manageSettings2.accesskey "B">
+
 <!ENTITY contentBlocking.socialblock.label "Sosjale-mediatrackers">
 
 <!ENTITY contentBlocking.cookies2.label "Cross-site-trackingcookies">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/devtools/client/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/devtools/client/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/devtools/client/debugger.properties	2019-09-13 05:16:17.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/devtools/client/debugger.properties	2019-09-15 11:36:34.000000000 +0000
@@ -218,10 +218,6 @@
 # source.
 blackboxCheckboxTooltip2=Blackboxing yn-/útskeakelje
 
-# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
-# DOM Mutation Breakpoints pane when there are no events.
-noDomMutationBreakpointsText=Gjin wer te jaan ôfbrekpunten.
-
 # LOCALIZATION NOTE (noDomMutationBreakpoints): The text to
 # display in the DOM Mutation Breakpoints pane when there are no events.
 # %S will be replaced by an active link using inspectorTool as text
@@ -230,6 +226,14 @@
 # LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
 inspectorTool=Inspector
 
+# LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
+# the event search input bar
+eventListenersHeader1.placeholder=Filterje op type barren
+
+# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
+# DOM Mutation Breakpoints pane when there are no events.
+noDomMutationBreakpointsText=Gjin wer te jaan ôfbrekpunten.
+
 # LOCALIZATION NOTE (domMutationHeader): The text to display in the
 # DOM Mutation Breakpoints header
 domMutationHeader=DOM-mutaasje-ôfbrekpunten
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/devtools/client/toolbox.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/devtools/client/toolbox.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/devtools/client/toolbox.properties	2019-09-13 05:16:17.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/devtools/client/toolbox.properties	2019-09-15 11:36:34.000000000 +0000
@@ -289,6 +289,18 @@
 # shown in the web replay timeline marker
 toolbox.replay.jumpMessage2=Nei %1$S gean
 
+# LOCALIZATION NOTE (toolbox.replay.resume): This is the text that appears in the
+# Replay command bar to prompt the user to resume the program.
+toolbox.replay.resume=Ferfetsje
+
+# LOCALIZATION NOTE (toolbox.replay.rewind): This is the text that appears in the
+# Replay command bar to prompt the user to rewind the program.
+toolbox.replay.rewind=Weromspiele
+
+# LOCALIZATION NOTE (toolbox.replay.pause): This is the text that appears in the
+# Replay command bar to prompt the user to pause the program.
+toolbox.replay.pause=Pauzearje
+
 # LOCALIZATION NOTE (toolbox.debugTargetErrorPage.title): This is the title
 # for the Error view shown by the toolbox when a connection to a debug target
 # could not be made
@@ -299,7 +311,7 @@
 # has happened while trying to connect to a debug target
 toolbox.debugTargetErrorPage.description = Kin gjin ferbining meitsje mei it debugdoel. Besjoch hjirûnder de flaterdetails:
 
-# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the 
+# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the
 # settings panel for panel that will be removed in future releases.
 # This entire text is treated as a link to an MDN page.
 options.deprecationNotice=Ferâldere. Mear ynfo…
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/toolkit/toolkit/about/certviewer.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:36:34.000000000 +0000
@@ -0,0 +1,57 @@
+# 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/.
+
+certificate-viewer-certificate-section-title = Sertifikaat
+
+## Error messages
+
+certificate-viewer-error-message = Wy koenen de sertifikaatynformaasje net fine, of it sertifikaat is skansearre. Probearje it opnij.
+certificate-viewer-error-title = Der is wat misgien.
+
+## Certificate information labels
+
+certificate-viewer-algorithm = Algoritme
+certificate-viewer-certificate-authority = Sertifikaatautoriteit
+certificate-viewer-cipher-suite = Kodearringssuite
+certificate-viewer-common-name = Algemiene namme
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-country = Lân fan fêstiging
+certificate-viewer-country = Lân
+certificate-viewer-curve = Kromme
+certificate-viewer-distribution-point = Distribúsjepunt
+certificate-viewer-dns-name = DNS-namme
+certificate-viewer-exponent = Eksponint
+certificate-viewer-id = ID
+certificate-viewer-key-exchange-group = Kaaiútwikselingsgroep
+certificate-viewer-key-id = Kaai-ID
+certificate-viewer-key-size = Kaaigrutte
+certificate-viewer-locality = Plak
+certificate-viewer-location = Lokaasje
+certificate-viewer-logid = Log-ID
+certificate-viewer-method = Metoade
+certificate-viewer-modulus = Modulus
+certificate-viewer-name = Namme
+certificate-viewer-not-after = Net nei
+certificate-viewer-not-before = Net foar
+certificate-viewer-organization = Organisaasje
+certificate-viewer-organizational-unit = Organisatoaryske ienheid
+certificate-viewer-policy = Belied
+certificate-viewer-protocol = Protokol
+certificate-viewer-public-value = Publike wearde
+certificate-viewer-purposes = Doelen
+certificate-viewer-qualifier = Kwalifikaasje
+certificate-viewer-qualifiers = Kwalifikaasjes
+certificate-viewer-required = Fereaske
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-state-province = Steat/provinsje fan fêstiging
+certificate-viewer-state-province = Steat/provinsje
+certificate-viewer-sha-1 = SHA-1
+certificate-viewer-sha-256 = SHA-256
+certificate-viewer-serial-number = Searjenûmer
+certificate-viewer-signature-algorithm = Hantekeningsalgoritme
+certificate-viewer-signature-scheme = Hantekeningskema
+certificate-viewer-timestamp = Tiidstimpel
+certificate-viewer-value = Wearde
+certificate-viewer-version = Ferzje
+certificate-viewer-business-category = Bedriuwskategory
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/toolkit/toolkit/global/processTypes.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/toolkit/toolkit/global/processTypes.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/fy-NL/toolkit/toolkit/global/processTypes.ftl	2019-09-13 05:16:17.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/fy-NL/toolkit/toolkit/global/processTypes.ftl	2019-09-15 11:36:34.000000000 +0000
@@ -18,6 +18,9 @@
 # process used to isolate webpages that requested special
 # permission to allocate large amounts of memory
 process-type-weblargeallocation = Grutte tawizing
+# process used to isolate a webpage from other web pages
+# to improve security
+process-type-webisolated = Isolearre webynhâld
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/gn/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/gn/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/gn/toolkit/toolkit/about/certviewer.ftl	2019-09-13 05:16:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/gn/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:36:46.000000000 +0000
@@ -21,6 +21,7 @@
 certificate-viewer-curve = Mbojere
 certificate-viewer-distribution-point = Ñemyasãiha
 certificate-viewer-dns-name = DNS réra
+certificate-viewer-exponent = Ñe’ẽhára
 certificate-viewer-id = ID
 certificate-viewer-key-exchange-group = Ñe’ẽñemi moambueha aty
 certificate-viewer-key-id = ID ñe'ẽñemi
@@ -34,13 +35,23 @@
 certificate-viewer-not-after = Ani uperire
 certificate-viewer-not-before = Ani upemboyve
 certificate-viewer-organization = Atyguasu
+certificate-viewer-organizational-unit = Joaju Atyguasugua
 certificate-viewer-policy = Purureko
 certificate-viewer-protocol = Taperekoite
 certificate-viewer-public-value = Opavavemba'éva repykue
+certificate-viewer-purposes = Japose
 certificate-viewer-qualifier = Tekome’ẽha
+certificate-viewer-qualifiers = Tekome’ẽha
 certificate-viewer-required = Tekotevẽva
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-state-province = Tetã/tetãvore
+certificate-viewer-state-province = Tetã/tetãvore
 certificate-viewer-sha-1 = SHA-1
 certificate-viewer-sha-256 = SHA-256
+certificate-viewer-serial-number = Papapy syryrýva
+certificate-viewer-signature-algorithm = Mboheraguapy algoritmo
+certificate-viewer-signature-scheme = Mboheraguapy apopyre
 certificate-viewer-timestamp = Ára ha aravo
 certificate-viewer-value = Tepykue
 certificate-viewer-version = Peteĩchagua
+certificate-viewer-business-category = Ñemuha jehechaukaha
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/gn/toolkit/toolkit/global/processTypes.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/gn/toolkit/toolkit/global/processTypes.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/gn/toolkit/toolkit/global/processTypes.ftl	2019-09-13 05:16:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/gn/toolkit/toolkit/global/processTypes.ftl	2019-09-15 11:36:46.000000000 +0000
@@ -18,6 +18,9 @@
 # process used to isolate webpages that requested special
 # permission to allocate large amounts of memory
 process-type-weblargeallocation = Ñeme'ẽmby tuicháva
+# process used to isolate a webpage from other web pages
+# to improve security
+process-type-webisolated = Ñanduti retepy mombyrygua
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/browser/aboutConfig.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/browser/aboutConfig.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/browser/aboutConfig.ftl	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/browser/aboutConfig.ftl	2019-09-15 11:37:06.000000000 +0000
@@ -10,6 +10,8 @@
 about-config2-title = Speciális beállítások
 about-config-search-input =
     .placeholder = Keresés
+about-config-search-input1 =
+    .placeholder = Beállításnév keresése
 about-config-show-all = Összes megjelenítése
 about-config-pref-add = Hozzáadás
 about-config-pref-toggle = Ki/be
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/browser/newtab/asrouter.ftl	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/browser/newtab/asrouter.ftl	2019-09-15 11:37:06.000000000 +0000
@@ -84,7 +84,13 @@
 cfr-whatsnew-panel-header = Újdonságok
 cfr-whatsnew-release-notes-link-text = Olvassa el a kiadási megjegyzéseket
 cfr-whatsnew-fx70-title = A { -brand-short-name } mostantól még keményebben küzd az adatvédelemért
+cfr-whatsnew-fx70-body =
+    A legújabb frissítés továbbfejleszti a Követésvédelem funkciót, és könnyebbé
+    teszi a biztonságos jelszavak létrehozását, mint valaha, minden oldalon.
 cfr-whatsnew-tracking-protect-title = Védje magát a nyomkövetőktől
+cfr-whatsnew-tracking-protect-body =
+    A { -brand-short-name } számos közismert közösségi média és weboldalak közti
+    nyomkövetőt blokkol, melyek követik Önt online.
 cfr-whatsnew-tracking-protect-link-text = Tekintse meg a jelentését
 # This string is displayed before a large numeral that indicates the total
 # number of tracking elements blocked. Don’t add $blockedCount to your
@@ -131,3 +137,16 @@
 cfr-doorhanger-firefox-send-body = Tartsa biztonságban a bizalmas dokumentumait a kíváncsi szemek elől a végpontok közötti titkosítással, és a hivatkozással, amely eltűnik, ha végzett.
 cfr-doorhanger-firefox-send-ok-button = Próbálja ki a { -send-brand-name }et
     .accesskey = P
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Lásd: Adatvédelem
+    .accesskey = A
+cfr-doorhanger-socialtracking-close-button = Bezárás
+    .accesskey = B
+cfr-doorhanger-socialtracking-heading = A { -brand-short-name } megakadályozta, hogy egy közösségi hálózat kövesse itt
+cfr-doorhanger-socialtracking-description = Számít az adatvédelem. A { -brand-short-name } most már blokkolja a gyakori közösségimédia-követőket, korlátozva hogy mennyi adatot gyűjthessenek az Ön online tevékenységéről.
+cfr-doorhanger-fingerprinters-heading = A { -brand-short-name } blokkolt egy ujjlenyomat-készítőt ezen az oldalon
+cfr-doorhanger-fingerprinters-description = Számít az adatvédelem. A { -brand-short-name } most már blokkolja az ujjlenyomat-készítőket, melyek egyedileg azonosítható információkat gyűjtenek az eszközéről, hogy követhessék Önt.
+cfr-doorhanger-cryptominers-heading = A { -brand-short-name } blokkolt egy kriptobányászt ezen az oldalon
+cfr-doorhanger-cryptominers-description = Számít az adatvédelem. A { -brand-short-name } most már blokkolja a kriptobányászokat, melyek a rendszere számítási erőforrásait használják, hogy digitális pénzeket bányásszanak.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/browser/policies/policies-descriptions.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/browser/policies/policies-descriptions.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/browser/policies/policies-descriptions.ftl	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/browser/policies/policies-descriptions.ftl	2019-09-15 11:37:06.000000000 +0000
@@ -66,8 +66,10 @@
 policy-NewTabPage = Az Új lap oldal engedélyezése vagy letiltása.
 policy-NoDefaultBookmarks = A { -brand-short-name }szal szállított alapértelmezett könyvjelzők és okos könyvjelzők (Legtöbbet látogatott, Friss címkék) létrehozásának letiltása. Megjegyzés: ez a házirend csak a profil első futtatása előtt van érvényben.
 policy-OfferToSaveLogins = A beállítás erőltetése, miszerint a { -brand-short-name } felajánlja a mentett bejelentkezések és jelszavak megjegyzését. Mind az igaz, mind a hamis érték elfogadott.
+policy-OfferToSaveLoginsDefault = Adja meg az alapértelmezett értéket, hogy a { -brand-short-name } felajánlja-e a mentett bejelentkezések és jelszavak megjegyzését. Mind az igaz, mind a hamis érték elfogadott.
 policy-OverrideFirstRunPage = Az első indítás oldal felülbírálása. Állítsa üres értékre ezt a házirendet, ha le akarja tiltani a az első indítás oldalt.
 policy-OverridePostUpdatePage = A frissítés utáni „Újdonságok” oldal felülbírálása. Állítsa üres ezt a házirendet, ha azt szeretné, hogy ne legyen frissítés utáni oldal.
+policy-PasswordManagerEnabled = A jelszavak jelszókezelőbe történő mentésének engedélyezése.
 policy-Permissions = A kamera, mikrofon, helyadatok és értesítések jogosultságának beállítása.
 policy-PopupBlocking = Bizonyos weboldalak alapértelmezetten jeleníthessenek meg felugró ablakokat.
 policy-Preferences = Értékek beállítása és zárolása a beállítások egy részhalmazánál.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/browser/preferences/preferences.ftl	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/browser/preferences/preferences.ftl	2019-09-15 11:37:06.000000000 +0000
@@ -742,6 +742,23 @@
 content-blocking-custom-desc = Válassza ki, mit akar blokkolni.
 content-blocking-private-trackers = Ismert követők csak privát ablakokban
 content-blocking-third-party-cookies = Harmadik féltől származó követő sütik
+
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
+# "Standard" in this case is an adjective, meaning "default" or "normal".
+enhanced-tracking-protection-setting-standard =
+    .label = Szokásos
+    .accesskey = S
+enhanced-tracking-protection-setting-strict =
+    .label = Szigorú
+    .accesskey = r
+enhanced-tracking-protection-setting-custom =
+    .label = Egyéni
+    .accesskey = E
+
+
+
 content-blocking-etp-standard-desc = Kiegyensúlyozott védelem és teljesítmény. Az oldalak normálisan fognak betölteni.
 content-blocking-etp-strict-desc = Erősebb védelem, de egyes webhelyek és tartalmak hibásan működhetnek.
 content-blocking-etp-custom-desc = Válassza ki a blokkolni kívánt nyomkövetőket és parancsfájlokat.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/browser/protections.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/browser/protections.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/browser/protections.ftl	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/browser/protections.ftl	2019-09-15 11:37:06.000000000 +0000
@@ -36,6 +36,7 @@
 lockwise-title-logged-in = { -lockwise-brand-name }
 lockwise-header-content = A { -lockwise-brand-name } biztonságosan tárolja a jelszavait a böngészőjében.
 lockwise-header-content-logged-in = Tárolja biztonságosan, és szinkronizálja a jelszavait az összes eszközén.
+about-logins-view-logins-button = Bejelentkezések megtekintése
 lockwise-no-logins-content = Szerezze be a <a data-l10n-name="lockwise-inline-link">{ -lockwise-brand-name }</a> alkalmazást, hogy bárhová elvigye a jelszavait.
 # This string is displayed after a large numeral that indicates the total number
 # of email addresses being monitored. Don’t add $count to
@@ -55,8 +56,11 @@
         [one] Szinkronizálás { $count } további eszközre
        *[other] Szinkronizálás { $count } további eszközre
     }
+lockwise-sync-not-syncing-devices = Nincs szinkronizálás más eszközökre
 monitor-title = Legyen résen az adatsértések miatt.
 monitor-link = Hogyan működik
+monitor-header-content-no-account = Ellenőrizze a { -monitor-brand-name } oldalt, és nézze meg, hogy szerepelt-e valamilyen ismert adatsértésben, és kapjon értesítést az új adatsértésekről.
+monitor-header-content-signed-in = A { -monitor-brand-name } figyelmezteti, ha az adatai új adatsértésben jelennek meg.
 monitor-sign-up = Iratkozzon fel az adatsértési figyelmeztetésekre
 auto-scan = Automatikusan ellenőrizve ma
 # This string is displayed after a large numeral that indicates the total number
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/browser/chrome/browser/browser.dtd	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/browser/chrome/browser/browser.dtd	2019-09-15 11:37:06.000000000 +0000
@@ -76,12 +76,21 @@
 <!ENTITY menubarCmd.label "Menüsor">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "Böngésző eszköztár">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
+<!ENTITY navbar.accessibleLabel "Navigáció">
 <!ENTITY personalbarCmd.label "Könyvjelző eszköztár">
 <!ENTITY personalbarCmd.accesskey "K">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
+<!ENTITY personalbar.accessibleLabel "Könyvjelzők">
 <!ENTITY bookmarksToolbarItem.label "Könyvjelző eszköztár elemei">
 
 <!ENTITY pageSourceCmd.label "Oldal forrása">
 <!ENTITY pageSourceCmd.accesskey "r">
+
 <!ENTITY pageSourceCmd.commandkey "u">
 <!-- LOCALIZATION NOTE (pageSourceCmd.SafariCommandKey should match the
 Option+Command keyboard shortcut letter that Safari and Chrome use for "View
@@ -92,6 +101,7 @@
 
 <!ENTITY pageInfoCmd.label "Oldal adatai">
 <!ENTITY pageInfoCmd.accesskey "O">
+
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY ldbCmd.label "Elrendezési hibakereső">
 <!ENTITY ldbCmd.accesskey "E">
@@ -117,6 +127,8 @@
 <!ENTITY fxaUnverified.label "Fiók ellenőrzése">
 
 
+ <!-- } is above this key on many keyboards -->
+
 <!ENTITY fullScreenMinimize.tooltip "Kis méret">
 <!ENTITY fullScreenRestore.tooltip "Helyreállítás">
 <!ENTITY fullScreenClose.tooltip "Bezárás">
@@ -145,6 +157,10 @@
      followed by the user's email. -->
 <!ENTITY fxa.menu.signedInAs.label "Bejelentkezve mint">
 <!ENTITY fxa.menu.manageAccount.label "Fiók kezelése…">
+
+<!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
+     for the Firefox Account toolbar menu screen. The `Signed in as` text is
+     followed by the user's email. -->
 <!ENTITY fxa.menu.syncSettings.label "&syncBrand.shortName.label; beállítások…">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Másik eszköz csatlakoztatása…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
@@ -195,6 +211,7 @@
 
 <!ENTITY bookmarksMenu.label "Könyvjelzők">
 <!ENTITY bookmarksMenu.accesskey "K">
+
 <!ENTITY bookmarkThisPageCmd.label "Oldal hozzáadása a könyvjelzőkhöz">
 <!ENTITY editThisBookmarkCmd.label "Könyvjelző szerkesztése">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -510,6 +527,7 @@
      This is set as the aria-label attribute for the search input box in the
      in-content search UI, to be used by screen readers. -->
 <!ENTITY contentSearchInput.label     "Keresőkifejezés">
+
 <!ENTITY contentSearchSubmit.tooltip  "Keresés indítása">
 
 <!-- LOCALIZATION NOTE (searchInput.placeholder):
@@ -972,6 +990,7 @@
 <!ENTITY contentBlocking.cookies.label "Sütik">
 <!ENTITY contentBlocking.cookiesView.label "Sütik és oldaladatok">
 
+
 <!ENTITY contentBlocking.socialblock.label "Közösségimédia-követők">
 
 <!ENTITY contentBlocking.cookies2.label "Webhelyek közötti nyomkövető sütik">
@@ -986,6 +1005,7 @@
 <!ENTITY contentBlocking.breakageReportView.label "Problémák bejelentése">
 <!ENTITY contentBlocking.breakageReportView2.description "A tartalomblokkolás problémákat okozhat néhány weboldalon. Ha bejelenti a problémákat, akkor segít jobbá tenni a &brandShortName; böngészőt mindenki számára. (Ez elküldi az URL-t, valamint a böngészőbeállításait a Mozillának.)">
 <!ENTITY contentBlocking.breakageReportView.learnMore "További tudnivalók">
+
 <!ENTITY contentBlocking.breakageReportView.title "Hibás webhely bejelentése">
 <!ENTITY contentBlocking.breakageReportView3.description "Egyes nyomkövetők blokkolása problémákat okozhat néhány weboldalon. Ezen problémák bejelentése segít jobbá tenni a &brandShortName; böngészőt mindenki számára. A jelentés elküldi az URL-t és a böngészőbeállításait a Mozillának.">
 <!ENTITY contentBlocking.breakageReportView2.learnMore "További tudnivalók">
@@ -1041,6 +1061,7 @@
 <!ENTITY newTabControlled.disableButton.accesskey "l">
 
 <!ENTITY homepageControlled.message "Egy kiegészítő megváltoztatta a kezdőlapot. Visszaállíthatja a beállításokat, ha nem szeretné ezt a változást.">
+
 <!ENTITY homepageControlled.header.message "A kezdőlap megváltozott.">
 <!ENTITY homepageControlled.keepButton.label "Módosítások megtartása">
 <!ENTITY homepageControlled.keepButton.accesskey "t">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/accessibility.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/accessibility.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/accessibility.ftl	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/accessibility.ftl	2019-09-15 11:37:06.000000000 +0000
@@ -47,7 +47,9 @@
 ## that describe that currently selected accessible object has a keyboard accessibility
 ## issue.
 
+accessibility-keyboard-issue-semantics = A fókuszálható elemeknek interaktív szemantikával kell rendelkezniük. <a>További tudnivalók</a>
 accessibility-keyboard-issue-tabindex = Kerülje a nullánál nagyobb <code>tabindex</code> attribútum használatát. <a>További tudnivalók</a>
 accessibility-keyboard-issue-action = Az interaktív elemeknek billentyűzettel aktiválhatónak kell lenniük. <a>További tudnivalók</a>
 accessibility-keyboard-issue-focusable = Az interaktív elemeknek fókuszálhatóknak kell lenniük. <a>További tudnivalók</a>
 accessibility-keyboard-issue-focus-visible = Lehet, hogy a fókuszálható elemről hiányzik a fókuszstílus. <a>További tudnivalók</a>
+accessibility-keyboard-issue-mouse-only = A kattintható elemeknek fókuszálhatónak kell lenniük, és interaktív szemantikával kell rendelkezniük. <a>További tudnivalók</a>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/application.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/application.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/application.ftl	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/application.ftl	2019-09-15 11:37:06.000000000 +0000
@@ -69,8 +69,11 @@
 # Suggestion to go to about:debugging in order to see Service Workers for all domains.
 # Clicking on the link will open about:debugging in a new tab.
 serviceworker-empty-suggestions-aboutdebugging = Vizsgálja meg a más tartományokból származó Service Workereket. <a>Nyissa meg az about:debugging oldalt</a>
-# Header for the view of Manifest displayed in the application panel for the current page.
+# Header for the Manifest page when we have an actual manifest
 manifest-view-header = Alkalmazás leírófájl
+# Header for the Manifest page when there's no manifest to inspect
+# The link will open https://developer.mozilla.org/en-US/docs/Web/Manifest
+manifest-empty-intro = Meg kell adnia egy webalkalmazás jegyzékfájlt, hogy itt vizsgálhassa. <a>További tudnivalók</a>
 # Header for the Errors and Warnings section of Manifest inspection displayed in the application panel.
 manifest-item-warnings = Hibák és figyelmeztetések
 # Header for the Identity section of Manifest inspection displayed in the application panel.
@@ -87,6 +90,14 @@
 manifest-loaded-error = Hiba történt a leírófájl betöltésekor:
 # Text displayed when the page has no manifest available
 manifest-non-existing = Nem található vizsgálható leírófájl.
+# Sidebar navigation item for Manifest sidebar item section
+sidebar-item-manifest = Jegyzékfájl
+    .alt = Jegyzékfájl ikon
+    .title = Jegyzékfájl
+# Sidebar navigation item for Service Workers sidebar item section
+sidebar-item-service-workers = Service Workerek
+    .alt = Service Workerek ikon
+    .title = Service Workerek
 # Text for the ALT and TITLE attributes of the warning icon
 icon-warning =
     .alt = Figyelmeztetés ikon
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/debugger.properties	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/debugger.properties	2019-09-15 11:37:06.000000000 +0000
@@ -218,10 +218,6 @@
 # source.
 blackboxCheckboxTooltip2=Fekete doboz be/ki
 
-# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
-# DOM Mutation Breakpoints pane when there are no events.
-noDomMutationBreakpointsText=Nincs megjeleníthető töréspont.
-
 # LOCALIZATION NOTE (noDomMutationBreakpoints): The text to
 # display in the DOM Mutation Breakpoints pane when there are no events.
 # %S will be replaced by an active link using inspectorTool as text
@@ -229,6 +225,14 @@
 # LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
 inspectorTool=Vizsgáló
 
+# LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
+# the event search input bar
+eventListenersHeader1.placeholder=Szűrés eseménytípus szerint
+
+# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
+# DOM Mutation Breakpoints pane when there are no events.
+noDomMutationBreakpointsText=Nincs megjeleníthető töréspont.
+
 # LOCALIZATION NOTE (domMutationHeader): The text to display in the
 # DOM Mutation Breakpoints header
 domMutationHeader=DOM-módosítási töréspontok
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/netmonitor.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/netmonitor.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/netmonitor.properties	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/netmonitor.properties	2019-09-15 11:37:06.000000000 +0000
@@ -771,6 +771,10 @@
 # displayed in the search toolbar to clear the search panel.
 netmonitor.search.toolbar.clear=Keresési találatok törlése
 
+# LOCALIZATION NOTE (netmonitor.search.toolbar.caseSensitive): This is the label
+# displayed in the search toolbar to do a case sensitive search.
+netmonitor.search.toolbar.caseSensitive=Kis- és nagybetűk megkülönböztetése
+
 # LOCALIZATION NOTE (netmonitor.search.labels.responseHeaders): This is the label
 # displayed in the search results as the label for the response headers
 netmonitor.search.labels.responseHeaders=Válaszfejléc
@@ -778,6 +782,37 @@
 # LOCALIZATION NOTE (netmonitor.search.labels.requestHeaders): This is the label
 # displayed in the search results as the label for the request headers
 netmonitor.search.labels.requestHeaders=Kérésfejléc
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.fetching): This is the label
+# displayed in the search results status bar when status is set to fetching.
+netmonitor.search.status.labels.fetching=Keresés…
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.canceled): This is the label
+# displayed in the search results status bar when status is set to cancelled.
+netmonitor.search.status.labels.canceled=Keresés megszakítva.
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.done): This is the label
+# displayed in the search results status bar when status is set to done.
+# %1$S is the number of matching lines in search results (netmonitor.search.status.labels.matchingLines)
+# %2$S is the number of files in which matching lines were found (netmonitor.search.status.labels.fileCount)
+netmonitor.search.status.labels.done=Keresés kész. %1$S %2$S.
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.matchingLines): Semi-colon list of plural forms.
+# This is the label displayed in the search results status bar showing matching lines found.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of matching lines found
+netmonitor.search.status.labels.matchingLines=#1 egyező sor találva;#1 egyező sor találva
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.fileCount): Semi-colon list of plural forms.
+# This is the label displayed in the search results status bar showing file count
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of files in which matching lines were found
+netmonitor.search.status.labels.fileCount=#1 fájlban;#1 fájlban
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.error): This is the label
+# displayed in the search results status bar when status is set to error.
+netmonitor.search.status.labels.error=Keresési hiba.
+
 # LOCALIZATION NOTE (messagesTruncated): This is the text displayed
 # in the messages panel when the number of messages is over the
 # truncation limit.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/startup.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/startup.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/startup.properties	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/startup.properties	2019-09-15 11:37:06.000000000 +0000
@@ -70,17 +70,16 @@
 # This is used as the label for the toolbox panel.
 ToolboxDebugger.panelLabel=Hibakereső panel
 
-# LOCALIZATION NOTE (ToolboxDebugger.tooltip2):
-# This string is displayed in the tooltip of the tab when the debugger is
-# displayed inside the developer tools window..
-# A keyboard shortcut for JS Debugger will be shown inside brackets.
-ToolboxDebugger.tooltip2=JavaScript hibakereső (%S)
-
 # LOCALIZATION NOTE (ToolboxDebugger.tooltip3):
 # This string is displayed in the tooltip of the tab when the debugger is
 # displayed inside the developer tools window.
 ToolboxDebugger.tooltip3=JavaScript hibakereső
 
+# LOCALIZATION NOTE (ToolboxDebugger.tooltip4):
+# This string is displayed in the tooltip of the tab when the debugger is
+# displayed inside the developer tools window.
+ToolboxDebugger.tooltip4=JavaScript hibakereső (%S)
+
 # LOCALIZATION NOTE (debuggerMenu.accesskey)
 # Used for the menuitem in the tool menu
 debuggerMenu.accesskey=H
@@ -104,48 +103,6 @@
 # editor.
 open.accesskey=u
 
-# LOCALIZATION NOTE (ToolboxShaderEditor.label):
-# This string is displayed in the title of the tab when the Shader Editor is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxShaderEditor.label=Árnyalószerkesztő
-
-# LOCALIZATION NOTE (ToolboxShaderEditor.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxShaderEditor.panelLabel=Árnyalószerkesztő panel
-
-# LOCALIZATION NOTE (ToolboxShaderEditor.tooltip):
-# This string is displayed in the tooltip of the tab when the Shader Editor is
-# displayed inside the developer tools window.
-ToolboxShaderEditor.tooltip=Élő GLSL árnyalónyelv-szerkesztő WebGL-hez
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.label):
-# This string is displayed in the title of the tab when the Shader Editor is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxCanvasDebugger.label=Vászon
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxCanvasDebugger.panelLabel=Vászon panel
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.tooltip):
-# This string is displayed in the tooltip of the tab when the Shader Editor is
-# displayed inside the developer tools window.
-ToolboxCanvasDebugger.tooltip=Eszközök <canvas> kontextusok vizsgálatához és hibakereséséhez
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.label):
-# This string is displayed in the title of the tab when the Web Audio Editor
-# is displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxWebAudioEditor1.label=Webes hang
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxWebAudioEditor1.panelLabel=Webes hang panel
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.tooltip):
-# This string is displayed in the tooltip of the tab when the Web Audio Editor is
-# displayed inside the developer tools window.
-ToolboxWebAudioEditor1.tooltip=Webes hang kontextusok megjelenítése és hangcsomópontok vizsgálata
-
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
 inspector.label=Vizsgáló
@@ -267,12 +224,6 @@
 # Used for the menuitem in the tool menu
 accessibility.accesskey=m
 
-# LOCALIZATION NOTE (accessibility.tooltip2):
-# This string is displayed in the tooltip of the tab when the Accessibility is
-# displayed inside the developer tools window.
-# Keyboard shortcut for Accessibility panel will be shown inside the brackets.
-accessibility.tooltip2=Akadálymentesítés
-
 # LOCALIZATION NOTE (accessibility.tooltip3):
 # This string is displayed in the tooltip of the tab when the Accessibility is
 # displayed inside the developer tools window.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/toolbox.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/toolbox.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/client/toolbox.properties	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/client/toolbox.properties	2019-09-15 11:37:06.000000000 +0000
@@ -289,6 +289,18 @@
 # shown in the web replay timeline marker
 toolbox.replay.jumpMessage2=Ugrás ide: %1$S
 
+# LOCALIZATION NOTE (toolbox.replay.resume): This is the text that appears in the
+# Replay command bar to prompt the user to resume the program.
+toolbox.replay.resume=Folytatás
+
+# LOCALIZATION NOTE (toolbox.replay.rewind): This is the text that appears in the
+# Replay command bar to prompt the user to rewind the program.
+toolbox.replay.rewind=Visszatekerés
+
+# LOCALIZATION NOTE (toolbox.replay.pause): This is the text that appears in the
+# Replay command bar to prompt the user to pause the program.
+toolbox.replay.pause=Szünet
+
 # LOCALIZATION NOTE (toolbox.debugTargetErrorPage.title): This is the title
 # for the Error view shown by the toolbox when a connection to a debug target
 # could not be made
@@ -299,7 +311,7 @@
 # has happened while trying to connect to a debug target
 toolbox.debugTargetErrorPage.description = Nem lehet csatlakozni a hibakeresési célhoz. Lásd a hiba részleteit:
 
-# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the 
+# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the
 # settings panel for panel that will be removed in future releases.
 # This entire text is treated as a link to an MDN page.
 options.deprecationNotice=Elavult. Tudjon meg többet…
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/shared/accessibility.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/shared/accessibility.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/devtools/shared/accessibility.properties	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/devtools/shared/accessibility.properties	2019-09-15 11:37:06.000000000 +0000
@@ -145,3 +145,8 @@
 # that describes that currently selected accessible object is focusable but
 # might not have appropriate focus styling.
 accessibility.keyboard.issue.focus.visible=Lehet, hogy a fókuszálható elemről hiányzik a fókuszstílus.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.mouse.only): A title text that
+# describes that currently selected accessible object is not focusable and not
+# semantic but can be activated via mouse (e.g. has click handler).
+accessibility.keyboard.issue.mouse.only=A kattintható elemeknek fókuszálhatónak kell lenniük, és interaktív szemantikával kell rendelkezniük.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/toolkit/toolkit/about/certviewer.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:37:06.000000000 +0000
@@ -0,0 +1,56 @@
+# 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/.
+
+certificate-viewer-certificate-section-title = Tanúsítvány
+
+## Error messages
+
+certificate-viewer-error-title = Valami hiba történt.
+
+## Certificate information labels
+
+certificate-viewer-algorithm = Algoritmus
+certificate-viewer-certificate-authority = Hitelesítésszolgáltató
+certificate-viewer-cipher-suite = Titkosító csomag
+certificate-viewer-common-name = Általános név
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-country = Szervezet országa
+certificate-viewer-country = Ország
+certificate-viewer-curve = Görbe
+certificate-viewer-distribution-point = Terjesztési pont
+certificate-viewer-dns-name = Tartománynév
+certificate-viewer-exponent = Kitevő
+certificate-viewer-id = Azonosító
+certificate-viewer-key-exchange-group = Kulcscsere csoport
+certificate-viewer-key-id = Kulcsazonosító
+certificate-viewer-key-size = Kulcsméret
+certificate-viewer-locality = Helység
+certificate-viewer-location = Hely
+certificate-viewer-logid = Naplóazonosító
+certificate-viewer-method = Módszer
+certificate-viewer-modulus = Modulus
+certificate-viewer-name = Név
+certificate-viewer-not-after = Vége
+certificate-viewer-not-before = Kezdete
+certificate-viewer-organization = Szervezet
+certificate-viewer-organizational-unit = Szervezeti egység
+certificate-viewer-policy = Irányelv
+certificate-viewer-protocol = Protokoll
+certificate-viewer-public-value = Nyilvános érték
+certificate-viewer-purposes = Célok
+certificate-viewer-qualifier = Minősítő
+certificate-viewer-qualifiers = Minősítők
+certificate-viewer-required = Kötelező
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-state-province = Szervezet állama/tartománya
+certificate-viewer-state-province = Állam/tartomány
+certificate-viewer-sha-1 = SHA-1
+certificate-viewer-sha-256 = SHA-256
+certificate-viewer-serial-number = Sorozatszám
+certificate-viewer-signature-algorithm = Aláírási algoritmus
+certificate-viewer-signature-scheme = Aláírási séma
+certificate-viewer-timestamp = Időbélyeg
+certificate-viewer-value = Érték
+certificate-viewer-version = Verzió
+certificate-viewer-business-category = Üzleti kategória
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/toolkit/toolkit/global/processTypes.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/toolkit/toolkit/global/processTypes.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/hu/toolkit/toolkit/global/processTypes.ftl	2019-09-13 05:16:44.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/hu/toolkit/toolkit/global/processTypes.ftl	2019-09-15 11:37:06.000000000 +0000
@@ -18,6 +18,9 @@
 # process used to isolate webpages that requested special
 # permission to allocate large amounts of memory
 process-type-weblargeallocation = Nagy lefoglalás
+# process used to isolate a webpage from other web pages
+# to improve security
+process-type-webisolated = Elkülönített webtartalom
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ia/chat/irc.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ia/chat/irc.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ia/chat/irc.properties	2019-09-13 05:16:51.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ia/chat/irc.properties	2019-09-15 11:37:12.000000000 +0000
@@ -31,6 +31,7 @@
 options.encoding=Collection de characteres
 options.quitMessage=Message de clausura
 options.partMessage=Message de exito
+options.showServerTab=Monstrar messages del servitor
 options.alternateNicks=Altere supernomines
 
 # LOCALIZATION NOTE (ctcp.version):
@@ -49,6 +50,8 @@
 command.action=%S &amp;lt;action a realisar&amp;gt;: exeque un action.
 command.ban=%S &lt;nick!user@host&gt;: blocar le usatores concordante le patrono date.
 command.ctcp=%S &lt;nick&gt; &lt;msg&gt;: invia un message CTCP al supernomine.
+command.part=%S [message]: abandona le canal actual con un message optional.
+command.ping=%S [&lt;pseudonymo&gt;]: demanda quanto lag ha un usator (o le servitor si nulle usator es specificate).
 
 # LOCALIZATION NOTE (message.*):
 #    These are shown as system messages in the conversation.
@@ -104,6 +107,10 @@
 message.channelKeyAdded=%1$S ha cambiate le contrasigno del canal a %2$S.
 message.channelKeyRemoved=%S ha removite le contrasigno del canal.
 #    This will be followed by a list of ban masks.
+message.banMasks=Usatores connexe ab le locos sequente es bannite ex %S:
+message.noBanMasks=Il non ha ulle locos bannite pro %S.
+message.banMaskAdded=Le usatores connexe an locos concordante %1$S ha essite bannite ex %2$S.
+message.banMaskRemoved=Le usatores connexe an locos concordante %1$S non es plus bannite ex %2$S.
 # LOCALIZATION NOTE (message.ping): Semi-colon list of plural forms.
 #  See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
 #   %1$S is the nickname of the user or the server that was pinged.
@@ -114,16 +121,23 @@
 #    These are shown as error messages in the conversation or server tab.
 #    %S is the channel name.
 error.noChannel=Non existe le canal: %S.
+error.tooManyChannels=Impossibile entrar in %S; tu es jam in trop canales.
 #    %1$S is your new nick, %2$S is the kill message from the server.
+error.nickCollision=Pseudonyme jam in uso, lo cambio in %1$S [%2$S].
+error.erroneousNickname=%S non es un pseudonyme consentite.
 error.banned=Tu es prohibite per iste servitor.
 error.bannedSoon=Tu sera tosto prohibite per iste servitor.
 error.mode.wrongUser=Impossibile cambiar modos pro altere usatores.
 #    %S is the nickname or channel name that isn't available.
 error.noSuchNick=%S non es online.
+error.wasNoSuchNick=Il non habeva ulle pseudonyme: %S
 error.noSuchChannel=Il ha nulle canal: %S.
 error.unavailable=%S es temporarimente indisponibile.
 #    %S is the channel name.
+error.channelBanned=Tu es bannite ex %S.
+error.cannotSendToChannel=Tu non pote inviar messages a %S.
 error.channelFull=Le canal %S es plen.
+error.inviteOnly=Tu debe esser invitate pro junger te a %S.
 error.sendMessageFailed=Un error occurreva durante le invio de tu ultime message. Per favor prova de novo un vice que le connexion ha essite restabilite.
 #    %1$S is the channel the user tried to join, %2$S is the channel
 #    he was forwarded to.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ia/chat/twitter.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ia/chat/twitter.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ia/chat/twitter.properties	2019-09-13 05:16:51.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ia/chat/twitter.properties	2019-09-15 11:37:12.000000000 +0000
@@ -8,6 +8,7 @@
 
 # LOCALIZATION NOTE (error.*):
 #   These are errors that will be shown to the user in conversation.
+error.tooLong=Le stato supera le 140 characteres.
 # LOCALIZATION NOTE (error.general, error.retweet, error.delete):
 #   %1$S will be either the error string returned by the twitter server,
 #   in English, inside parenthesis, or the empty string if we have no specific
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ia/chat/xmpp.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ia/chat/xmpp.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ia/chat/xmpp.properties	2019-09-13 05:16:51.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ia/chat/xmpp.properties	2019-09-15 11:37:12.000000000 +0000
@@ -47,9 +47,12 @@
 #   This is displayed in a conversation as an error message when the user is
 #   banned from a room.
 #   %S is the name of the MUC room.
+conversation.error.joinForbidden=Tu non pote junger te a %S perque tu es bannite ex iste canal.
+conversation.error.creationFailedNotAllowed=Accesso limitate: permissos insufficiente pro crear canales.
 #   This is displayed in a conversation as an error message when remote server
 #   is not found.
 #   %S is the name of MUC room.
+conversation.error.changeTopicFailedNotAuthorized=Tu non ha permissos de definir le subjecto de ce canal.
 #   This is displayed in a conversation as an error message when the user sends
 #   a message to a room that he is not in.
 #   %1$S is the name of MUC room.
@@ -60,12 +63,20 @@
 #   %2$S is the text of the message that wasn't delivered.
 #   These are displayed in a conversation as a system error message.
 conversation.error.remoteServerNotFound=Impossibile attinger le servitor del receptaculo.
+conversation.error.unknownSendError=Un error incognite eveniva durante le invio de iste message.
 #   %S is the name of the message recipient.
+conversation.error.sendServiceUnavailable=Il non es possibile inviar actualmente messages a %S.
 #   %S is the nick of participant that is not in room.
 conversation.error.nickNotInRoom=%S non es in camera.
+conversation.error.banCommandAnonymousRoom=Tu non pote bannir participantes ex canales anonyme. Proba /kick in vice.
+conversation.error.banKickCommandConflict=Tu non pote remover te mesme ex le canal.
+conversation.error.changeNickFailedConflict=Impossibile cambiar tu pseudonymo in %S perque illo es jam in uso.
+conversation.error.changeNickFailedNotAcceptable=Impossibile cambiar tu pseudonymo in %S perque le pseudonymos es blocate in iste canal.
+conversation.error.inviteFailedForbidden=Tu non ha privilegios necessari pro invitar usatores in iste canal.
 #   %S is the jid of user that is invited.
 conversation.error.failedJIDNotFound=Impossibile attinger %S.
 #   %S is the jid that is invalid.
+conversation.error.commandFailedNotInRoom=Tu debe entrar de novo in le canal pro usar iste commando.
 #   %S is the name of the recipient.
 
 # LOCALIZATION NOTE (conversation.error.version.*):
@@ -107,10 +118,14 @@
 #   %2$S is the room.
 #   %3$S is the reason which is a message provided by the person sending the
 #   invitation.
+conversation.muc.invitationWithReason2=%1$S te invitava a entrar in le canal %2$S: %3$S
 #   %3$S is the password of the room.
 #   %4$S is the reason which is a message provided by the person sending the
 #   invitation.
+conversation.muc.invitationWithReason2.password=%1$S te invitava a entrar in %2$S con contrasigno %3$S: %4$S
+conversation.muc.invitationWithoutReason=%1$S te ha invitate a entrar in %2$S
 #   %3$S is the password of the room.
+conversation.muc.invitationWithoutReason.password=%1$S te ha invitate a entrar in %2$S con contrasigno %3$S
 
 # LOCALIZATION NOTE (conversation.muc.join):
 #   This is displayed as a system message when a participant joins room.
@@ -144,12 +159,20 @@
 #   %1$S is the participant that is banned.
 #   %2$S is the reason.
 #   %3$S is the person who is banning.
+conversation.message.banned=%1$S es bannite ex le canal.
+conversation.message.banned.reason=%1$S es bannite ex le canal: %2$S
 #   %1$S is the person who is banning.
 #   %2$S is the participant that is banned.
 #   %3$S is the reason.
+conversation.message.banned.actor=%1$S ha bannite %2$S ex le canal.
+conversation.message.banned.actor.reason=%1$S ha bannite %2$S ex le canal: %3$S
+conversation.message.banned.you=Tu es bannite ex le canal.
 #   %1$S is the reason.
+conversation.message.banned.you.reason=Tu es bannite ex le canal: %1$S
 #   %1$S is the person who is banning.
 #   %2$S is the reason.
+conversation.message.banned.you.actor=%1$S te ha bannite ex le canal.
+conversation.message.banned.you.actor.reason=%1$S te ha bannite ex le canal: %2$S
 
 # LOCALIZATION NOTE (conversation.message.kicked.*):
 #   These are displayed as a system message when a participant is kicked from
@@ -176,11 +199,16 @@
 #   a room because the room has been changed to members-only.
 #   %1$S is the participant that is removed.
 #   %2$S is the person who changed the room configuration.
+conversation.message.removedNonMember=%1$S ha essite removite ex le canal perque su configuration ha essite cambiate a solo pro membros.
+conversation.message.removedNonMember.actor=%1$S ha essite removite ex le canal perque %2$S lo ha cambiate a solo pro membros.
+conversation.message.removedNonMember.you=Tu ha essite removite ex le canal perque su configuration ha essite cambiate a solo pro membros.
 #   %1$S is the person who changed the room configuration.
+conversation.message.removedNonMember.you.actor=Tu ha essite removite ex le canal perque %1$S lo ha cambiate a solo pro membros.
 
 # LOCALIZATION NOTE (conversation.message.MUCShutdown):
 #   These are displayed as a system message when a participant is removed from
 #   a room because of a system shutdown.
+conversation.message.mucShutdown=Tu ha essite removite ex le canal per le arresto del systema.
 
 # LOCALIZATION NOTE (conversation.message.version*):
 #   %1$S is the name of the user whose version was requested.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/browser/aboutLogins.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/browser/aboutLogins.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/browser/aboutLogins.ftl	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/browser/aboutLogins.ftl	2019-09-15 11:37:24.000000000 +0000
@@ -63,6 +63,9 @@
 login-list-item-title-new-login = Nuova credenziale
 login-list-item-subtitle-new-login = Inserisci le credenziali di accesso
 login-list-item-subtitle-missing-username = (nessun nome utente)
+about-logins-list-item-warning-icon =
+  .alt = Icona avviso
+  .title = Sito web coinvolto in violazioni di dati
 
 ## Introduction screen
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/browser/browser.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/browser/browser.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/browser/browser.ftl	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/browser/browser.ftl	2019-09-15 11:37:24.000000000 +0000
@@ -2,5 +2,48 @@
 # 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/.
 
-browser-urlbar-identity-button =
+urlbar-identity-button =
     .aria-label = Visualizza informazioni sul sito
+
+## Tooltips for images appearing in the address bar
+
+urlbar-services-notification-anchor =
+    .tooltiptext = Apri il pannello con il messaggio di installazione
+urlbar-web-notification-anchor =
+    .tooltiptext = Decidi se ricevere notifiche da questo sito
+urlbar-midi-notification-anchor =
+    .tooltiptext = Apri pannello MIDI
+urlbar-eme-notification-anchor =
+    .tooltiptext = Gestisci l’utilizzo del software DRM
+urlbar-web-authn-anchor =
+    .tooltiptext = Apri pannello autenticazione web
+urlbar-canvas-notification-anchor =
+    .tooltiptext = Accedere ai dati dei canvas
+urlbar-web-rtc-share-microphone-notification-anchor =
+    .tooltiptext = Gestisci la condivisione del microfono con il sito
+urlbar-default-notification-anchor =
+    .tooltiptext = Apri il pannello dei messaggi
+urlbar-geolocation-notification-anchor =
+    .tooltiptext = Apri il pannello con l’indirizzo della richiesta
+urlbar-storage-access-anchor =
+    .tooltiptext = Apri il pannello relativo ai permessi per la navigazione
+urlbar-translate-notification-anchor =
+    .tooltiptext = Traduci questa pagina
+urlbar-web-rtc-share-screen-notification-anchor =
+    .tooltiptext = Gestisci la condivisione delle finestre o dello schermo con il sito
+urlbar-indexed-db-notification-anchor =
+    .tooltiptext = Apri il pannello con il messaggio relativo all’archiviazione non in linea per le app
+urlbar-password-notification-anchor =
+    .tooltiptext = Apri il pannello per il salvataggio delle password
+urlbar-translated-notification-anchor =
+    .tooltiptext = Gestisci la traduzione della pagina
+urlbar-plugins-notification-anchor =
+    .tooltiptext = Gestisci l’utilizzo dei plugin
+urlbar-web-rtc-share-devices-notification-anchor =
+    .tooltiptext = Gestisci la condivisione di fotocamera e/o microfono con il sito
+urlbar-autoplay-notification-anchor =
+    .tooltiptext = Apri il pannello relativo alla riproduzione automatica
+urlbar-persistent-storage-notification-anchor =
+    .tooltiptext = Salvataggio dati nell’archivio permanente
+urlbar-addons-notification-anchor =
+    .tooltiptext = Apri il pannello con il messaggio di installazione componente aggiuntivo
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/browser/menubar.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/browser/menubar.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/browser/menubar.ftl	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/browser/menubar.ftl	2019-09-15 11:37:24.000000000 +0000
@@ -212,6 +212,9 @@
 menu-tools-sync-sign-in =
     .label = Accedi a { -sync-brand-short-name }…
     .accesskey = y
+menu-tools-turn-on-sync =
+    .label = Attiva { -sync-brand-short-name }…
+    .accesskey = v
 menu-tools-sync-now =
     .label = Sincronizza adesso
     .accesskey = z
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/browser/syncedTabs.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/browser/syncedTabs.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/browser/syncedTabs.ftl	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/browser/syncedTabs.ftl	2019-09-15 11:37:24.000000000 +0000
@@ -5,6 +5,7 @@
 synced-tabs-sidebar-title = Schede sincronizzate
 synced-tabs-sidebar-noclients-subtitle = Come fare per visualizzare in questa sezione le schede da altri dispositivi?
 synced-tabs-sidebar-notsignedin = Accedi per visualizzare un elenco delle schede aperte in altri dispositivi.
+synced-tabs-sidebar-intro = Visualizza un elenco delle schede aperte in altri dispositivi.
 synced-tabs-sidebar-unverified = L’account non è ancora stato verificato.
 synced-tabs-sidebar-notabs = Nessuna scheda aperta
 synced-tabs-sidebar-openprefs = Apri le impostazioni di { -sync-brand-short-name }
@@ -37,3 +38,4 @@
     .label = Gestione dispositivi…
     .accesskey = G
 fxa-sign-in = Accedi a { -sync-brand-short-name }
+turn-on-sync = Attiva { -sync-brand-short-name }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/chrome/browser/browser.dtd	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/chrome/browser/browser.dtd	2019-09-15 11:37:24.000000000 +0000
@@ -292,8 +292,11 @@
 <!ENTITY appMenuRemoteTabs.noclients.subtitle "Come fare per visualizzare in questa sezione le schede da altri dispositivi?">
 <!ENTITY appMenuRemoteTabs.opensyncprefs.label "Apri preferenze Sync">
 <!ENTITY appMenuRemoteTabs.notsignedin.label "Accedi per visualizzare un elenco delle schede aperte in altri dispositivi.">
+<!ENTITY appMenuRemoteTabs.welcome.label "Visualizza un elenco delle schede aperte in altri dispositivi.">
 <!ENTITY appMenuRemoteTabs.unverified.label "L’account non è ancora stato verificato.">
 <!ENTITY appMenuRemoteTabs.signin.label "Accedi a Sync">
+<!ENTITY appMenuRemoteTabs.signintosync.label "Accedi a &syncBrand.shortName.label;…">
+<!ENTITY appMenuRemoteTabs.turnonsync.label "Attiva &syncBrand.shortName.label;…">
 <!ENTITY appMenuRemoteTabs.managedevices.label "Gestione dispositivi…">
 <!ENTITY appMenuRemoteTabs.sidebar.label "Visualizza barra laterale Schede sincronizzate">
 <!ENTITY appMenuRemoteTabs.hidesidebar.label "Nascondi barra laterale Schede sincronizzate">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/pdfviewer/viewer.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/pdfviewer/viewer.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/browser/pdfviewer/viewer.properties	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/browser/pdfviewer/viewer.properties	2019-09-15 11:37:24.000000000 +0000
@@ -154,5 +154,5 @@
 password_cancel = Annulla
 printing_not_supported = Attenzione: la stampa non è completamente supportata da questo browser.
 printing_not_ready = Attenzione: il PDF non è ancora stato caricato completamente per la stampa.
-web_fonts_disabled = I web font risultano disattivati: impossibile utilizzare i caratteri inclusi nel PDF.
+web_fonts_disabled = I web font risultano disattivati: impossibile utilizzare i caratteri incorporati nel PDF.
 document_colors_not_allowed = Non è possibile visualizzare i colori originali definiti nel file PDF: l’opzione del browser “Consenti alle pagine di scegliere i propri colori invece di quelli impostati” è disattivata.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/devtools/client/accessibility.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/devtools/client/accessibility.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/devtools/client/accessibility.ftl	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/devtools/client/accessibility.ftl	2019-09-15 11:37:24.000000000 +0000
@@ -23,7 +23,7 @@
 accessibility-text-label-issue-area = Utilizzare l’attributo <code>alt</code> per assegnare un’etichetta agli elementi <div>area</div> che presentano un attributo <span>href</span>. <a>Ulteriori informazioni</a>
 accessibility-text-label-issue-dialog = I dialoghi devono avere un’etichetta. <a>Ulteriori informazioni</a>
 accessibility-text-label-issue-document-title = I documenti devono avere un <code>title</code>. <a>Ulteriori informazioni</a>
-accessibility-text-label-issue-embed = I contenuti inclusi (“embedded”) devono avere un’etichetta. <a>Ulteriori informazioni</a>
+accessibility-text-label-issue-embed = I contenuti incorporati (“embedded”) devono avere un’etichetta. <a>Ulteriori informazioni</a>
 accessibility-text-label-issue-figure = Figure con didascalie (“caption”) facoltative devono avere un’etichetta. <a>Ulteriori informazioni</a>
 accessibility-text-label-issue-fieldset = Gli elementi <code>fieldset</code> devono avere un’etichetta. <a>Ulteriori informazioni</a>
 accessibility-text-label-issue-fieldset-legend = Utilizzare l’elemento <code>legend</code> per assegnare un’etichetta agli elementi <span>fieldset</span>. <a>Ulteriori informazioni</a>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/devtools/client/application.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/devtools/client/application.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/devtools/client/application.ftl	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/devtools/client/application.ftl	2019-09-15 11:37:24.000000000 +0000
@@ -33,6 +33,7 @@
 manifest-loaded-ok = Caricato manifesto.
 manifest-loaded-error = Si è verificato un errore durante il caricamento del manifesto:
 manifest-non-existing = Nessun manifesto trovato da analizzare.
+manifest-json-link-data-url = Il manifesto è incorporato in un Data URL.
 # Sidebar navigation item for Manifest sidebar item section
 sidebar-item-manifest = Manifesto
   .alt = Icona manifesto
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/devtools/client/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/devtools/client/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/devtools/client/debugger.properties	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/devtools/client/debugger.properties	2019-09-15 11:37:24.000000000 +0000
@@ -243,6 +243,7 @@
 xhrBreakpoints.label = Aggiungi punto di interruzione XHR
 xhrBreakpoints.item.label = URL contiene “%S”
 pauseOnAnyXHR = Sospendi su qualunque XHR
+watchpoints.removeWatchpoint = Rimuovi watchpoint
 sourceTabs.closeTab = Chiudi scheda
 sourceTabs.closeTab.accesskey = h
 sourceTabs.closeTab.key = CmdOrCtrl+W
@@ -359,6 +360,7 @@
 whyPaused.breakpointConditionThrown = Errore su punto di interruzione condizionale
 whyPaused.xhr = Sospeso su una richiesta XMLHttpRequest
 whyPaused.promiseRejection = Sospeso sul rifiuto di un promise
+whyPaused.getWatchpoint = Sospeso sull’accesso a una proprietà
 whyPaused.assert = Sospeso su un’asserzione
 whyPaused.debugCommand = Sospeso su una funzione in debug
 whyPaused.other = Debugger Sospeso
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/devtools/shared/accessibility.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/devtools/shared/accessibility.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/devtools/shared/accessibility.properties	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/devtools/shared/accessibility.properties	2019-09-15 11:37:24.000000000 +0000
@@ -9,7 +9,7 @@
 accessibility.text.label.issue.area = Utilizzare l’attributo “alt” per assegnare un’etichetta agli elementi “area” che presentano un attributo “href”.
 accessibility.text.label.issue.dialog = I dialoghi devono avere un’etichetta.
 accessibility.text.label.issue.document.title = I documenti devono avere un title.
-accessibility.text.label.issue.embed = I contenuti inclusi (“embedded”) devono avere un’etichetta.
+accessibility.text.label.issue.embed = I contenuti incorporati (“embedded”) devono avere un’etichetta.
 accessibility.text.label.issue.figure = Figure con didascalie (“caption”) facoltative devono avere un’etichetta.
 accessibility.text.label.issue.fieldset = Gli elementi “fieldset” devono avere un’etichetta.
 accessibility.text.label.issue.fieldset.legend = Utilizzare l’elemento “legend” per assegnare un’etichetta agli elementi “fieldset”.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/dom/chrome/dom/dom.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/dom/chrome/dom/dom.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/dom/chrome/dom/dom.properties	2019-09-13 05:16:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/dom/chrome/dom/dom.properties	2019-09-15 11:37:24.000000000 +0000
@@ -220,7 +220,7 @@
 ReadableStreamReadingFailed = Lettura dei dati non riuscita da ReadableStream: “%S”.
 RegisterProtocolHandlerInsecureWarning = L’utilizzo di registerProtocolHandler per connessioni non sicure verrà rimosso in Firefox 62.
 RegisterProtocolHandlerPrivateBrowsingWarning = Non è possibile utilizzare registerProtocolHandler in modalità Navigazione anonima.
-MixedDisplayObjectSubrequestWarning = La possibilità di caricare contenuti non sicuri in un plugin incluso in una connessione sicura verrà presto rimossa.
+MixedDisplayObjectSubrequestWarning = La possibilità di caricare contenuti non sicuri in un plugin incorporato in una connessione sicura verrà presto rimossa.
 MotionEventWarning = L’utilizzo del sensore di movimento è deprecato.
 OrientationEventWarning = L’utilizzo del sensore di orientamento è deprecato.
 ProximityEventWarning = L’utilizzo del sensore di prossimità è deprecato.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/toolkit/toolkit/pictureinpicture/pictureinpicture.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/toolkit/toolkit/pictureinpicture/pictureinpicture.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/it/toolkit/toolkit/pictureinpicture/pictureinpicture.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/it/toolkit/toolkit/pictureinpicture/pictureinpicture.ftl	2019-09-15 11:37:24.000000000 +0000
@@ -0,0 +1,5 @@
+# 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/.
+
+pictureinpicture-player-title = Picture-in-Picture
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/lij/browser/browser/protections.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/lij/browser/browser/protections.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/lij/browser/browser/protections.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/lij/browser/browser/protections.ftl	2019-09-15 11:37:50.000000000 +0000
@@ -0,0 +1,15 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+# This string is used to label the X axis of a graph. Other days of the week are generated via Intl.DateTimeFormat,
+# capitalization for this string should match the output for your locale.
+graph-today = Ancheu
+
+## The title attribute is used to display the type of protection.
+## The aria-label is spoken by screen readers to make the visual graph accessible to blind users.
+##
+## Variables:
+##   $count (Number) - Number of specific trackers
+##   $percentage (Number) - Percentage this type of tracker contributes to the whole graph
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/lij/browser/installer/nsisstrings.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/lij/browser/installer/nsisstrings.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/lij/browser/installer/nsisstrings.properties	2019-09-13 05:17:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/lij/browser/installer/nsisstrings.properties	2019-09-15 11:37:50.000000000 +0000
@@ -9,8 +9,9 @@
 # Accesskeys are defined by prefixing the letter that is to be used for the
 # accesskey with an ampersand (e.g. &).
 
-# Do not replace $BrandShortName, $BrandFullName, or $BrandFullNameDA with a
-# custom string and always use the same one as used by the en-US files.
+# Do not replace $BrandShortName, $BrandProductName, $BrandFullName,
+# or $BrandFullNameDA with a custom string and always use the same one as used
+# by the en-US files.
 # $BrandFullNameDA allows the string to contain an ampersand (e.g. DA stands
 # for double ampersand) and prevents the letter following the ampersand from
 # being used as an accesskey.
@@ -20,15 +21,18 @@
 
 INSTALLER_WIN_CAPTION=Instalatô de $BrandShortName
 
-# The \n in the next two strings can be moved or deleted as needed to make
-# the string fit in the 3 lines of space available.
-STUB_CLEANUP_PAVEOVER_HEADER=$BrandShortName io l'é za instalou.\nAgiornilo.
-STUB_CLEANUP_REINSTALL_HEADER=$BrandShortName o l'é za stæto instalou primma.\nPiggite 'na còpia neuva.
+STUB_CLEANUP_PAVEOVER_HEADER2=$BrandShortName o l'é za instalou. Oua t'agiorno mi.
+STUB_CLEANUP_REINSTALL_HEADER2=$BrandShortName o l'é za stæto instalou primma. Te fasso scaregâ 'na còpia neuva.
 STUB_CLEANUP_PAVEOVER_BUTTON=&Agiorna
 STUB_CLEANUP_REINSTALL_BUTTON=&Installa torna
 STUB_CLEANUP_CHECKBOX_LABEL=&Repiggia e inpostaçioin predefinie e scancella i vegi conponenti azonti pe-e megio prestaçioin
 
 STUB_INSTALLING_LABEL2=Son derê a instalâ…
+# The \n in the next string is intended to force a nice-looking layout in en-US
+# and can be moved or deleted as needed. There's no practical limit on the
+# number of lines available.
+STUB_INSTALLING_HEADLINE=Metti a teu privacy a-o primmo pòsto\nUniscite a $BrandProductName.
+STUB_INSTALLING_BODY=Descòvri tutti i nòstri produti pe-a privacy e inpara a mesciate in linea in mòddo ciù inteligente e seguo.
 STUB_BLURB_FIRST1=O ciù veloce e pronto $BrandShortName
 STUB_BLURB_SECOND1=Caregamento de pagine e cangiamento de feuggio ciù veloce
 STUB_BLURB_THIRD1=Navegaçion privâ potente
@@ -47,6 +51,3 @@
 STUB_CANCEL_PROMPT_MESSAGE=Se ti anulli, $BrandShortName o no saiâ instalou.
 STUB_CANCEL_PROMPT_BUTTON_CONTINUE=Installa $BrandShortName
 STUB_CANCEL_PROMPT_BUTTON_EXIT=Anulla
-
-VERSION_32BIT=$BrandShortName a 32-bit
-VERSION_64BIT=$BrandShortName a 64-bit 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nb-NO/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/nb-NO/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nb-NO/toolkit/toolkit/about/certviewer.ftl	2019-09-13 05:17:42.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nb-NO/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:38:13.000000000 +0000
@@ -13,25 +13,44 @@
 
 certificate-viewer-algorithm = Algoritme
 certificate-viewer-certificate-authority = Sertifikatutsteder
+certificate-viewer-cipher-suite = Krypteringssuite
 certificate-viewer-common-name = Vanlig navn
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-country = Organisasjonsland
 certificate-viewer-country = Land
+certificate-viewer-curve = Kurve
+certificate-viewer-distribution-point = Distribusjonspunkt
 certificate-viewer-dns-name = DNS-navn
 certificate-viewer-exponent = Eksponent
 certificate-viewer-id = ID
+certificate-viewer-key-exchange-group = Gruppe for nøkkelutveksling
+certificate-viewer-key-id = Nøkkel-ID
+certificate-viewer-key-size = Nøkkelstørrelse
+certificate-viewer-locality = Sted
+certificate-viewer-location = Adresse
+certificate-viewer-logid = Logg-ID
+certificate-viewer-method = Metode
+certificate-viewer-modulus = Modulus
 certificate-viewer-name = Navn
 certificate-viewer-not-after = Ikke etter
 certificate-viewer-not-before = Ikke før
 certificate-viewer-organization = Organisasjon
 certificate-viewer-organizational-unit = Organisasjonsenhet
+certificate-viewer-policy = Policy
 certificate-viewer-protocol = Protokoll
+certificate-viewer-public-value = Offentlig verdi
 certificate-viewer-purposes = Formål
 certificate-viewer-qualifier = Kvalifikator
 certificate-viewer-qualifiers = Kvalifikatorer
 certificate-viewer-required = Nødvendig
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-state-province = Organisasjonsstat/-provins
+certificate-viewer-state-province = Delstat/provins
 certificate-viewer-sha-1 = SHA-1
 certificate-viewer-sha-256 = SHA-256
 certificate-viewer-serial-number = Serienummer
 certificate-viewer-signature-algorithm = Signaturalgoritme
+certificate-viewer-signature-scheme = Signaturskjema
 certificate-viewer-timestamp = Tidsstempel
 certificate-viewer-value = Verdi
 certificate-viewer-version = Versjon
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nb-NO/toolkit/toolkit/global/processTypes.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/nb-NO/toolkit/toolkit/global/processTypes.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nb-NO/toolkit/toolkit/global/processTypes.ftl	2019-09-13 05:17:42.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nb-NO/toolkit/toolkit/global/processTypes.ftl	2019-09-15 11:38:13.000000000 +0000
@@ -18,6 +18,9 @@
 # process used to isolate webpages that requested special
 # permission to allocate large amounts of memory
 process-type-weblargeallocation = Stor tildeling
+# process used to isolate a webpage from other web pages
+# to improve security
+process-type-webisolated = Isolert nettinnhold
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/browser/browser/newtab/asrouter.ftl	2019-09-13 05:17:48.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/browser/browser/newtab/asrouter.ftl	2019-09-15 11:38:23.000000000 +0000
@@ -139,3 +139,16 @@
 cfr-doorhanger-firefox-send-body = Houd uw gevoelige documenten weg bij nieuwsgierige blikken met end-to-end-versleuteling en een koppeling die verdwijnt als u klaar bent.
 cfr-doorhanger-firefox-send-ok-button = { -send-brand-name } proberen
     .accesskey = p
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Beschermingen bekijken
+    .accesskey = B
+cfr-doorhanger-socialtracking-close-button = Sluiten
+    .accesskey = S
+cfr-doorhanger-socialtracking-heading = { -brand-short-name } heeft verhinderd dat een sociaal netwerk u hier volgt
+cfr-doorhanger-socialtracking-description = Uw privacy is belangrijk. { -brand-short-name } blokkeert nu veelgebruikte sociale-mediatrackers en beperkt zo, hoeveel gegevens ze kunnen verzamelen over wat u online doet.
+cfr-doorhanger-fingerprinters-heading = { -brand-short-name } heeft een fingerprinter op deze pagina geblokkeerd
+cfr-doorhanger-fingerprinters-description = Uw privacy is belangrijk. { -brand-short-name } blokkeert nu fingerprinters, die stukjes uniek identificeerbare informatie over uw apparaat verzamelen om u te volgen.
+cfr-doorhanger-cryptominers-heading = { -brand-short-name } heeft een cryptominer op deze pagina geblokkeerd
+cfr-doorhanger-cryptominers-description = Uw privacy is belangrijk. { -brand-short-name } blokkeert nu cryptominers, die de rekenkracht van uw systeem gebruiken om digitale valuta te minen.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/browser/browser/preferences/preferences.ftl	2019-09-13 05:17:48.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/browser/browser/preferences/preferences.ftl	2019-09-15 11:38:23.000000000 +0000
@@ -745,6 +745,23 @@
 content-blocking-custom-desc = Kies wat er wordt geblokkeerd.
 content-blocking-private-trackers = Bekende trackers alleen in privévensters
 content-blocking-third-party-cookies = Tracking-cookies van derden
+
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
+# "Standard" in this case is an adjective, meaning "default" or "normal".
+enhanced-tracking-protection-setting-standard =
+    .label = Standaard
+    .accesskey = d
+enhanced-tracking-protection-setting-strict =
+    .label = Streng
+    .accesskey = r
+enhanced-tracking-protection-setting-custom =
+    .label = Aangepast
+    .accesskey = A
+
+
+
 content-blocking-etp-standard-desc = Gebalanceerd voor bescherming en prestaties. Pagina’s laden normaal.
 content-blocking-etp-strict-desc = Sterkere bescherming, maar kan er voor zorgen dat sommige websites of inhoud niet werken.
 content-blocking-etp-custom-desc = Kies welke trackers en scripts u wilt blokkeren.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/browser/chrome/browser/baseMenuOverlay.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/browser/chrome/browser/baseMenuOverlay.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/browser/chrome/browser/baseMenuOverlay.dtd	2019-09-13 05:17:48.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/browser/chrome/browser/baseMenuOverlay.dtd	2019-09-15 11:38:23.000000000 +0000
@@ -15,7 +15,7 @@
 <!ENTITY helpMenuWin.label        "Help"> 
 <!ENTITY helpMenuWin.accesskey    "H">
 <!ENTITY aboutProduct2.label      "Over &brandShorterName;">
-<!ENTITY aboutProduct2.accesskey  "F">
+<!ENTITY aboutProduct2.accesskey  "O">
 <!ENTITY productHelp2.label       "&brandShorterName; Help">
 <!ENTITY productHelp2.accesskey   "H">
 <!ENTITY helpMac.commandkey       "?">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/browser/chrome/browser/browser.dtd	2019-09-13 05:17:48.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/browser/chrome/browser/browser.dtd	2019-09-15 11:38:23.000000000 +0000
@@ -991,6 +991,8 @@
 <!ENTITY contentBlocking.cookies.label "Cookies">
 <!ENTITY contentBlocking.cookiesView.label "Cookies en websitegegevens">
 
+<!ENTITY contentBlocking.manageSettings2.accesskey "B">
+
 <!ENTITY contentBlocking.socialblock.label "Sociale-mediatrackers">
 
 <!ENTITY contentBlocking.cookies2.label "Cross-site-trackingcookies">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/devtools/client/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/devtools/client/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/devtools/client/debugger.properties	2019-09-13 05:17:48.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/devtools/client/debugger.properties	2019-09-15 11:38:23.000000000 +0000
@@ -218,10 +218,6 @@
 # source.
 blackboxCheckboxTooltip2=Blackboxing in-/uitschakelen
 
-# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
-# DOM Mutation Breakpoints pane when there are no events.
-noDomMutationBreakpointsText=Geen weer te geven afbreekpunten.
-
 # LOCALIZATION NOTE (noDomMutationBreakpoints): The text to
 # display in the DOM Mutation Breakpoints pane when there are no events.
 # %S will be replaced by an active link using inspectorTool as text
@@ -230,6 +226,14 @@
 # LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
 inspectorTool=Inspector
 
+# LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
+# the event search input bar
+eventListenersHeader1.placeholder=Filteren op gebeurtenistype
+
+# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
+# DOM Mutation Breakpoints pane when there are no events.
+noDomMutationBreakpointsText=Geen weer te geven afbreekpunten.
+
 # LOCALIZATION NOTE (domMutationHeader): The text to display in the
 # DOM Mutation Breakpoints header
 domMutationHeader=DOM-mutatie-afbreekpunten
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/devtools/client/toolbox.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/devtools/client/toolbox.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/devtools/client/toolbox.properties	2019-09-13 05:17:48.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/devtools/client/toolbox.properties	2019-09-15 11:38:23.000000000 +0000
@@ -289,6 +289,18 @@
 # shown in the web replay timeline marker
 toolbox.replay.jumpMessage2=Naar %1$S gaan
 
+# LOCALIZATION NOTE (toolbox.replay.resume): This is the text that appears in the
+# Replay command bar to prompt the user to resume the program.
+toolbox.replay.resume=Hervatten
+
+# LOCALIZATION NOTE (toolbox.replay.rewind): This is the text that appears in the
+# Replay command bar to prompt the user to rewind the program.
+toolbox.replay.rewind=Terugspoelen
+
+# LOCALIZATION NOTE (toolbox.replay.pause): This is the text that appears in the
+# Replay command bar to prompt the user to pause the program.
+toolbox.replay.pause=Pauzeren
+
 # LOCALIZATION NOTE (toolbox.debugTargetErrorPage.title): This is the title
 # for the Error view shown by the toolbox when a connection to a debug target
 # could not be made
@@ -299,7 +311,7 @@
 # has happened while trying to connect to a debug target
 toolbox.debugTargetErrorPage.description = Kan geen verbinding maken met het debugdoel. Bekijk hieronder de foutdetails:
 
-# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the 
+# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the
 # settings panel for panel that will be removed in future releases.
 # This entire text is treated as a link to an MDN page.
 options.deprecationNotice=Verouderd. Meer info…
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/toolkit/chrome/global/wizard.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/toolkit/chrome/global/wizard.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/toolkit/chrome/global/wizard.dtd	2019-09-13 05:17:48.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/toolkit/chrome/global/wizard.dtd	2019-09-15 11:38:23.000000000 +0000
@@ -5,7 +5,7 @@
 <!ENTITY  button-back-mac.label        "Teruggaan">
 <!ENTITY  button-back-mac.accesskey    "T">
 <!ENTITY  button-next-mac.label        "Doorgaan">
-<!ENTITY  button-next-mac.accesskey    "V">
+<!ENTITY  button-next-mac.accesskey    "D">
 <!ENTITY  button-finish-mac.label      "Gereed">
 <!ENTITY  button-cancel-mac.label      "Annuleren">
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/toolkit/toolkit/about/certviewer.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:38:23.000000000 +0000
@@ -0,0 +1,57 @@
+# 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/.
+
+certificate-viewer-certificate-section-title = Certificaat
+
+## Error messages
+
+certificate-viewer-error-message = We konden de certificaatinformatie niet vinden, of het certificaat is beschadigd. Probeer het opnieuw.
+certificate-viewer-error-title = Er is iets misgegaan.
+
+## Certificate information labels
+
+certificate-viewer-algorithm = Algoritme
+certificate-viewer-certificate-authority = Certificaatautoriteit
+certificate-viewer-cipher-suite = Coderingssuite
+certificate-viewer-common-name = Algemene naam
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-country = Land van vestiging
+certificate-viewer-country = Land
+certificate-viewer-curve = Kromme
+certificate-viewer-distribution-point = Distributiepunt
+certificate-viewer-dns-name = DNS-naam
+certificate-viewer-exponent = Exponent
+certificate-viewer-id = ID
+certificate-viewer-key-exchange-group = Sleuteluitwisselingsgroep
+certificate-viewer-key-id = Sleutel-ID
+certificate-viewer-key-size = Sleutelgrootte
+certificate-viewer-locality = Plaats
+certificate-viewer-location = Locatie
+certificate-viewer-logid = Log-ID
+certificate-viewer-method = Methode
+certificate-viewer-modulus = Modulus
+certificate-viewer-name = Naam
+certificate-viewer-not-after = Niet na
+certificate-viewer-not-before = Niet voor
+certificate-viewer-organization = Organisatie
+certificate-viewer-organizational-unit = Organisatorische eenheid
+certificate-viewer-policy = Beleid
+certificate-viewer-protocol = Protocol
+certificate-viewer-public-value = Publieke waarde
+certificate-viewer-purposes = Doeleinden
+certificate-viewer-qualifier = Kwalificatie
+certificate-viewer-qualifiers = Kwalificaties
+certificate-viewer-required = Vereist
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-state-province = Staat/provincie van vestiging
+certificate-viewer-state-province = Staat/provincie
+certificate-viewer-sha-1 = SHA-1
+certificate-viewer-sha-256 = SHA-256
+certificate-viewer-serial-number = Serienummer
+certificate-viewer-signature-algorithm = Handtekeningsalgoritme
+certificate-viewer-signature-scheme = Handtekeningschema
+certificate-viewer-timestamp = Tijdstempel
+certificate-viewer-value = Waarde
+certificate-viewer-version = Versie
+certificate-viewer-business-category = Bedrijfscategorie
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/toolkit/toolkit/global/processTypes.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/toolkit/toolkit/global/processTypes.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nl/toolkit/toolkit/global/processTypes.ftl	2019-09-13 05:17:48.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nl/toolkit/toolkit/global/processTypes.ftl	2019-09-15 11:38:23.000000000 +0000
@@ -18,6 +18,9 @@
 # process used to isolate webpages that requested special
 # permission to allocate large amounts of memory
 process-type-weblargeallocation = Grote toewijzing
+# process used to isolate a webpage from other web pages
+# to improve security
+process-type-webisolated = Geïsoleerde webinhoud
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nn-NO/devtools/client/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/nn-NO/devtools/client/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nn-NO/devtools/client/debugger.properties	2019-09-13 05:17:51.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nn-NO/devtools/client/debugger.properties	2019-09-15 11:38:28.000000000 +0000
@@ -218,10 +218,6 @@
 # source.
 blackboxCheckboxTooltip2=Toggle blackboxing
 
-# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
-# DOM Mutation Breakpoints pane when there are no events.
-noDomMutationBreakpointsText=No breakpoints to display.
-
 # LOCALIZATION NOTE (noDomMutationBreakpoints): The text to
 # display in the DOM Mutation Breakpoints pane when there are no events.
 # %S will be replaced by an active link using inspectorTool as text
@@ -230,6 +226,14 @@
 # LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
 inspectorTool=Inspector
 
+# LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
+# the event search input bar
+eventListenersHeader1.placeholder=Filter by event type
+
+# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
+# DOM Mutation Breakpoints pane when there are no events.
+noDomMutationBreakpointsText=No breakpoints to display.
+
 # LOCALIZATION NOTE (domMutationHeader): The text to display in the
 # DOM Mutation Breakpoints header
 domMutationHeader=DOM Mutation Breakpoints
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nn-NO/devtools/client/toolbox.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/nn-NO/devtools/client/toolbox.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nn-NO/devtools/client/toolbox.properties	2019-09-13 05:17:51.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nn-NO/devtools/client/toolbox.properties	2019-09-15 11:38:28.000000000 +0000
@@ -291,9 +291,11 @@
 
 # LOCALIZATION NOTE (toolbox.replay.resume): This is the text that appears in the
 # Replay command bar to prompt the user to resume the program.
+toolbox.replay.resume=Resume
 
 # LOCALIZATION NOTE (toolbox.replay.rewind): This is the text that appears in the
 # Replay command bar to prompt the user to rewind the program.
+toolbox.replay.rewind=Rewind
 
 # LOCALIZATION NOTE (toolbox.replay.pause): This is the text that appears in the
 # Replay command bar to prompt the user to pause the program.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/nn-NO/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/nn-NO/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/nn-NO/toolkit/toolkit/about/certviewer.ftl	2019-09-13 05:17:51.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/nn-NO/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:38:28.000000000 +0000
@@ -11,6 +11,7 @@
 ## Certificate information labels
 
 certificate-viewer-algorithm = Algoritme
+certificate-viewer-common-name = Vanleg namn
 certificate-viewer-country = Land
 certificate-viewer-id = ID
 certificate-viewer-version = Versjon
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/browser/browser/aboutConfig.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/browser/browser/aboutConfig.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/browser/browser/aboutConfig.ftl	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/browser/browser/aboutConfig.ftl	2019-09-15 11:38:39.000000000 +0000
@@ -10,6 +10,8 @@
 about-config2-title = Konfiguracja zaawansowana
 about-config-search-input =
     .placeholder = Szukaj
+about-config-search-input1 =
+    .placeholder = Szukaj preferencji
 about-config-show-all = Wyświetl wszystko
 about-config-pref-add = Dodaj
 about-config-pref-toggle = Przełącz
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/browser/browser/newtab/asrouter.ftl	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/browser/browser/newtab/asrouter.ftl	2019-09-15 11:38:39.000000000 +0000
@@ -144,3 +144,16 @@
 cfr-doorhanger-firefox-send-body = Chroń swoje poufne dokumenty przed wścibskimi oczami dzięki szyfrowaniu typu „end-to-end” i odnośnikowi, który znika po użyciu.
 cfr-doorhanger-firefox-send-ok-button = Wypróbuj { -send-brand-name }
     .accesskey = W
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Wyświetl ochronę
+    .accesskey = o
+cfr-doorhanger-socialtracking-close-button = Zamknij
+    .accesskey = Z
+cfr-doorhanger-socialtracking-heading = { -brand-short-name } powstrzymał serwis społecznościowy przed śledzeniem Cię na tej witrynie
+cfr-doorhanger-socialtracking-description = Twoja prywatność jest ważna. { -brand-short-name } blokuje teraz najczęściej występujące elementy śledzące serwisów społecznościowych, ograniczając ilość danych, które mogą zebrać na temat Twoich działań w Internecie.
+cfr-doorhanger-fingerprinters-heading = { -brand-short-name } zablokował na tej witrynie element śledzący przez zbieranie informacji o konfiguracji
+cfr-doorhanger-fingerprinters-description = Twoja prywatność jest ważna. { -brand-short-name } blokuje teraz elementy zbierające jednoznacznie identyfikowalne informacje o używanym urządzeniu, aby Cię śledzić.
+cfr-doorhanger-cryptominers-heading = { -brand-short-name } zablokował na tej witrynie element używający komputera użytkownika do generowania kryptowalut
+cfr-doorhanger-cryptominers-description = Twoja prywatność jest ważna. { -brand-short-name } blokuje teraz elementy wykorzystujące moc obliczeniową Twojego komputera do generowania cyfrowych walut.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/browser/browser/preferences/preferences.ftl	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/browser/browser/preferences/preferences.ftl	2019-09-15 11:38:39.000000000 +0000
@@ -729,8 +729,8 @@
 ## Privacy Section - Content Blocking
 
 content-blocking-header = Blokowanie treści
-content-blocking-enhanced-tracking-protection = Wzmocniona ochrona przed śledzeniem
 content-blocking-section-description = Chroń swoją prywatność podczas przeglądania. Blokuj niewidoczne elementy, które śledzą odwiedzane witryny i Cię profilują. Zablokowanie niektórych treści może przyspieszyć wczytywanie stron.
+content-blocking-enhanced-tracking-protection = Wzmocniona ochrona przed śledzeniem
 content-blocking-section-top-level-description = Elementy śledzące monitorują Cię w Internecie, zbierając informacje o Twoich działaniach i zainteresowaniach. { -brand-short-name } blokuje wiele tych elementów i inne złośliwe skrypty.
 content-blocking-learn-more = Więcej informacji
 # The terminology used to refer to categories of Content Blocking is also used in chrome/browser/browser.properties and should be translated consistently.
@@ -749,6 +749,23 @@
 content-blocking-custom-desc = Wybierz, co blokować:
 content-blocking-private-trackers = znane elementy śledzące w oknach prywatnych
 content-blocking-third-party-cookies = ciasteczka zewnętrznych witryn używane do śledzenia
+
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
+# "Standard" in this case is an adjective, meaning "default" or "normal".
+enhanced-tracking-protection-setting-standard =
+    .label = Standardowa
+    .accesskey = S
+enhanced-tracking-protection-setting-strict =
+    .label = Ścisła
+    .accesskey = c
+enhanced-tracking-protection-setting-custom =
+    .label = Własna
+    .accesskey = W
+
+
+
 content-blocking-etp-standard-desc = Równowaga między bezpieczeństwem a szybkością wczytywania stron. Strony będą działać bez problemów.
 content-blocking-etp-strict-desc = Silniejsza ochrona, ale może powodować niepoprawne działanie niektórych stron.
 content-blocking-etp-custom-desc = Wybierz, które elementy śledzące i skrypty blokować:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/browser/chrome/browser/browser.dtd	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/browser/chrome/browser/browser.dtd	2019-09-15 11:38:39.000000000 +0000
@@ -76,12 +76,21 @@
 <!ENTITY menubarCmd.label "Pasek menu">
 <!ENTITY menubarCmd.accesskey "m">
 <!ENTITY navbarCmd.label "Pasek narzędzi nawigacyjnych">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
+<!ENTITY navbar.accessibleLabel "Nawigacja">
 <!ENTITY personalbarCmd.label "Pasek zakładek">
 <!ENTITY personalbarCmd.accesskey "z">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
+<!ENTITY personalbar.accessibleLabel "Zakładki">
 <!ENTITY bookmarksToolbarItem.label "Elementy paska zakładek">
 
 <!ENTITY pageSourceCmd.label "Źródło strony">
 <!ENTITY pageSourceCmd.accesskey "d">
+
 <!ENTITY pageSourceCmd.commandkey "u">
 <!-- LOCALIZATION NOTE (pageSourceCmd.SafariCommandKey should match the
 Option+Command keyboard shortcut letter that Safari and Chrome use for "View
@@ -92,6 +101,7 @@
 
 <!ENTITY pageInfoCmd.label "Informacje o stronie">
 <!ENTITY pageInfoCmd.accesskey "m">
+
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY ldbCmd.label "Debuger układu">
 <!ENTITY ldbCmd.accesskey "r">
@@ -117,6 +127,9 @@
 <!ENTITY fxaUnverified.label "Zweryfikuj konto">
 
 
+<!ENTITY togglePictureInPicture.key2 "}">
+<!ENTITY togglePictureInPicture.key "]"> <!-- } is above this key on many keyboards -->
+
 <!ENTITY fullScreenMinimize.tooltip "Minimalizuj">
 <!ENTITY fullScreenRestore.tooltip "Przywróć">
 <!ENTITY fullScreenClose.tooltip "Zamknij">
@@ -145,6 +158,10 @@
      followed by the user's email. -->
 <!ENTITY fxa.menu.signedInAs.label "Zalogowano jako">
 <!ENTITY fxa.menu.manageAccount.label "Zarządzaj kontem…">
+
+<!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
+     for the Firefox Account toolbar menu screen. The `Signed in as` text is
+     followed by the user's email. -->
 <!ENTITY fxa.menu.syncSettings.label "Ustawienia synchronizacji…">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Połącz inne urządzenie…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
@@ -195,6 +212,7 @@
 
 <!ENTITY bookmarksMenu.label "Zakładki">
 <!ENTITY bookmarksMenu.accesskey "Z">
+
 <!ENTITY bookmarkThisPageCmd.label "Dodaj zakładkę">
 <!ENTITY editThisBookmarkCmd.label "Edytuj zakładkę">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -510,6 +528,7 @@
      This is set as the aria-label attribute for the search input box in the
      in-content search UI, to be used by screen readers. -->
 <!ENTITY contentSearchInput.label     "Pole wyszukiwania">
+
 <!ENTITY contentSearchSubmit.tooltip  "Szukaj">
 
 <!-- LOCALIZATION NOTE (searchInput.placeholder):
@@ -814,8 +833,6 @@
 
 <!ENTITY identity.connection "Połączenie">
 <!ENTITY identity.connectionSecure "Zabezpieczone połączenie">
-
-<!ENTITY identity.connectionSecure2 "Zabezpieczone połączenie">
 <!ENTITY identity.connectionNotSecure "Połączenie nie jest bezpieczne">
 
 <!ENTITY identity.connectionSecure3 "Zabezpieczone połączenie">
@@ -829,8 +846,6 @@
 <!ENTITY identity.insecureLoginForms2 "Dane logowania wprowadzone na tej stronie nie są chronione.">
 <!ENTITY identity.customRoot "Połączenie zweryfikowane przez wystawcę certyfikatu, który nie jest rozpoznawany przez Mozillę.">
 
-<!ENTITY identity.evOwnerLabel "Zarządzana przez:">
-
 <!ENTITY identity.evOwnerLabel2 "Certyfikat wystawiony dla:">
 
 <!-- Strings for connection state warnings. -->
@@ -867,9 +882,6 @@
 
 <!ENTITY identity.permissions "Uprawnienia">
 
-<!-- LOCALIZATION NOTE (identity.permissions2): "set" as in "configured for this website" -->
-<!ENTITY identity.permissions2 "Nadane uprawnienia">
-
 <!ENTITY identity.permissions3 "Uprawnienia">
 <!ENTITY identity.permissionsEmpty "Witryna korzysta z domyślnych uprawnień.">
 <!ENTITY identity.permissionsReloadHint "Ponowne wczytanie strony może być konieczne, aby wprowadzone zmiany przyniosły skutek.">
@@ -883,7 +895,6 @@
      protections.etpMoreInfo.label: The text a screen reader speaks when focused on the info button. -->
 <!ENTITY protections.etpMoreInfo.label "Więcej informacji o wzmocnionej ochronie przed śledzeniem">
 <!ENTITY protections.settings.label "Ustawienia ochrony">
-<!ENTITY protections.report.label "Wyświetl pełny raport">
 <!ENTITY protections.showreport.label "Wyświetl raport">
 <!-- LOCALIZATION NOTE:
      protections.siteNotWorking.label: The link to be clicked to open the sub-panel view
@@ -901,7 +912,6 @@
 <!ENTITY protections.siteNotWorkingView.issueList.payments "płatnościami">
 <!ENTITY protections.siteNotWorkingView.issueList.comments "komentarzami">
 <!ENTITY protections.siteNotWorkingView.issueList.videos "filmami">
-<!ENTITY protections.siteNotWorkingView.siteStillBroken.label "Strona nie działa nawet po wyłączeniu ochrony?">
 <!ENTITY protections.siteNotWorkingView.sendReport.label "Wyślij zgłoszenie">
 
 <!-- LOCALIZATION NOTE (protections.blocking2.label, protections.notBlocking2.label, protections.notFound.label):
@@ -929,7 +939,6 @@
 <!ENTITY protections.crossSiteTrackingCookies.description "Te ciasteczka śledzą Cię od strony do strony w celu zbierania danych o tym, co robisz w Internecie. Są umieszczane przez zewnętrzne firmy, takie jak agencje reklamowe i firmy analityczne.">
 <!ENTITY protections.cryptominers.description "Te elementy wykorzystują moc obliczeniową Twojego komputera do generowania cyfrowych walut. Skrypty generujące kryptowaluty rozładowują baterię, spowalniają komputer i mogą zwiększyć rachunek za prąd.">
 <!ENTITY protections.fingerprinters.description "Te elementy zbierają ustawienia przeglądarki i komputera, aby utworzyć profil użytkownika. Za pomocą tego cyfrowego odcisku palca mogą śledzić Cię między różnymi witrynami.">
-<!ENTITY protections.trackingContent.description "Witryny mogą wczytywać zewnętrzne reklamy, filmy i inne treści zawierające elementy śledzące. Blokowanie ich może przyspieszyć wczytywanie stron, ale niektóre przyciski, formularze i pola logowania mogą działać niepoprawnie.">
 <!ENTITY protections.trackingContent2.description "Witryny mogą wczytywać zewnętrzne reklamy, filmy i inne treści z elementami śledzącymi. Blokowanie ich może przyspieszyć wczytywanie stron, ale niektóre przyciski, formularze i pola logowania mogą działać niepoprawnie.">
 <!ENTITY protections.socialMediaTrackers.description "Serwisy społecznościowe umieszczają elementy śledzące na innych witrynach, aby śledzić co robisz, widzisz i oglądasz w Internecie. Dzięki temu ich właściciele wiedzą o Tobie więcej, niż udostępniasz w ich serwisach.">
 
@@ -982,6 +991,8 @@
 <!ENTITY contentBlocking.cookies.label "Ciasteczka">
 <!ENTITY contentBlocking.cookiesView.label "Ciasteczka i dane stron">
 
+<!ENTITY contentBlocking.manageSettings2.accesskey "Z">
+
 <!ENTITY contentBlocking.socialblock.label "Elementy śledzące serwisów społecznościowych">
 
 <!ENTITY contentBlocking.cookies2.label "Ciasteczka śledzące między witrynami">
@@ -996,6 +1007,7 @@
 <!ENTITY contentBlocking.breakageReportView.label "Zgłaszanie problemu">
 <!ENTITY contentBlocking.breakageReportView2.description "Blokowanie treści może powodować problemy z niektórymi stronami. Zgłaszając problemy, pomagasz ulepszać program &brandShortName; (adres odwiedzanej strony oraz informacje o ustawieniach przeglądarki zostaną przesłane do Mozilli).">
 <!ENTITY contentBlocking.breakageReportView.learnMore "Więcej informacji">
+
 <!ENTITY contentBlocking.breakageReportView.title "Zgłoś niepoprawnie działającą stronę">
 <!ENTITY contentBlocking.breakageReportView3.description "Blokowanie pewnych elementów śledzących może powodować problemy z niektórymi stronami. Zgłaszając problemy, pomagasz ulepszać program &brandShortName; (adres odwiedzanej strony oraz informacje o ustawieniach przeglądarki zostaną przesłane do Mozilli).">
 <!ENTITY contentBlocking.breakageReportView2.learnMore "Więcej informacji">
@@ -1051,6 +1063,7 @@
 <!ENTITY newTabControlled.disableButton.accesskey "W">
 
 <!ENTITY homepageControlled.message "Rozszerzenie zmieniło stronę startową, ale można przywrócić poprzednią.">
+
 <!ENTITY homepageControlled.header.message "Strona startowa została zmieniona.">
 <!ENTITY homepageControlled.keepButton.label "Używaj nowej">
 <!ENTITY homepageControlled.keepButton.accesskey "U">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/client/application.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/client/application.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/client/application.ftl	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/client/application.ftl	2019-09-15 11:38:39.000000000 +0000
@@ -69,8 +69,11 @@
 # Suggestion to go to about:debugging in order to see Service Workers for all domains.
 # Clicking on the link will open about:debugging in a new tab.
 serviceworker-empty-suggestions-aboutdebugging = Przejrzyj wątki usługowe z innych domen. <a>Otwórz stronę about:debugging</a>
-# Header for the view of Manifest displayed in the application panel for the current page.
+# Header for the Manifest page when we have an actual manifest
 manifest-view-header = Manifest aplikacji
+# Header for the Manifest page when there's no manifest to inspect
+# The link will open https://developer.mozilla.org/en-US/docs/Web/Manifest
+manifest-empty-intro = Należy najpierw dodać manifest aplikacji internetowej, aby mogła być tutaj wyświetlana. <a>Więcej informacji</a>
 # Header for the Errors and Warnings section of Manifest inspection displayed in the application panel.
 manifest-item-warnings = Błędy i ostrzeżenia
 # Header for the Identity section of Manifest inspection displayed in the application panel.
@@ -87,6 +90,14 @@
 manifest-loaded-error = Wystąpił błąd podczas wczytywania manifestu:
 # Text displayed when the page has no manifest available
 manifest-non-existing = Nie odnaleziono manifestu do zbadania.
+# Sidebar navigation item for Manifest sidebar item section
+sidebar-item-manifest = Manifest
+    .alt = Ikona manifestu
+    .title = Manifest
+# Sidebar navigation item for Service Workers sidebar item section
+sidebar-item-service-workers = Wątki usługowe
+    .alt = Ikona wątków usługowych
+    .title = Wątki usługowe
 # Text for the ALT and TITLE attributes of the warning icon
 icon-warning =
     .alt = Ikona ostrzeżenia
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/client/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/client/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/client/debugger.properties	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/client/debugger.properties	2019-09-15 11:38:39.000000000 +0000
@@ -218,10 +218,6 @@
 # source.
 blackboxCheckboxTooltip2=Włącz/wyłącz czarną skrzynkę
 
-# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
-# DOM Mutation Breakpoints pane when there are no events.
-noDomMutationBreakpointsText=Brak punktów wstrzymania do wyświetlenia.
-
 # LOCALIZATION NOTE (noDomMutationBreakpoints): The text to
 # display in the DOM Mutation Breakpoints pane when there are no events.
 # %S will be replaced by an active link using inspectorTool as text
@@ -230,6 +226,14 @@
 # LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
 inspectorTool=inspektorze
 
+# LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
+# the event search input bar
+eventListenersHeader1.placeholder=Filtruj wg typu zdarzeń
+
+# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
+# DOM Mutation Breakpoints pane when there are no events.
+noDomMutationBreakpointsText=Brak punktów wstrzymania do wyświetlenia.
+
 # LOCALIZATION NOTE (domMutationHeader): The text to display in the
 # DOM Mutation Breakpoints header
 domMutationHeader=Punkty wstrzymania mutacji DOM
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/client/netmonitor.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/client/netmonitor.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/client/netmonitor.properties	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/client/netmonitor.properties	2019-09-15 11:38:39.000000000 +0000
@@ -771,6 +771,10 @@
 # displayed in the search toolbar to clear the search panel.
 netmonitor.search.toolbar.clear=Wyczyść wyniki wyszukiwania
 
+# LOCALIZATION NOTE (netmonitor.search.toolbar.caseSensitive): This is the label
+# displayed in the search toolbar to do a case sensitive search.
+netmonitor.search.toolbar.caseSensitive=Rozróżnianie wielkości liter
+
 # LOCALIZATION NOTE (netmonitor.search.labels.responseHeaders): This is the label
 # displayed in the search results as the label for the response headers
 netmonitor.search.labels.responseHeaders=Nagłówek odpowiedzi
@@ -778,6 +782,37 @@
 # LOCALIZATION NOTE (netmonitor.search.labels.requestHeaders): This is the label
 # displayed in the search results as the label for the request headers
 netmonitor.search.labels.requestHeaders=Nagłówek żądania
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.fetching): This is the label
+# displayed in the search results status bar when status is set to fetching.
+netmonitor.search.status.labels.fetching=Wyszukiwanie…
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.canceled): This is the label
+# displayed in the search results status bar when status is set to cancelled.
+netmonitor.search.status.labels.canceled=Anulowano wyszukiwanie.
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.done): This is the label
+# displayed in the search results status bar when status is set to done.
+# %1$S is the number of matching lines in search results (netmonitor.search.status.labels.matchingLines)
+# %2$S is the number of files in which matching lines were found (netmonitor.search.status.labels.fileCount)
+netmonitor.search.status.labels.done=Ukończono wyszukiwanie. %1$S %2$S.
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.matchingLines): Semi-colon list of plural forms.
+# This is the label displayed in the search results status bar showing matching lines found.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of matching lines found
+netmonitor.search.status.labels.matchingLines=Odnaleziono #1 pasujący wiersz;Odnaleziono #1 pasujące wiersze;Odnaleziono #1 pasujących wierszy
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.fileCount): Semi-colon list of plural forms.
+# This is the label displayed in the search results status bar showing file count
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of files in which matching lines were found
+netmonitor.search.status.labels.fileCount=w #1 pliku;w #1 plikach;w #1 plikach
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.error): This is the label
+# displayed in the search results status bar when status is set to error.
+netmonitor.search.status.labels.error=Błąd wyszukiwania.
+
 # LOCALIZATION NOTE (messagesTruncated): This is the text displayed
 # in the messages panel when the number of messages is over the
 # truncation limit.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/client/startup.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/client/startup.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/client/startup.properties	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/client/startup.properties	2019-09-15 11:38:39.000000000 +0000
@@ -70,17 +70,16 @@
 # This is used as the label for the toolbox panel.
 ToolboxDebugger.panelLabel=Panel debugera
 
-# LOCALIZATION NOTE (ToolboxDebugger.tooltip2):
-# This string is displayed in the tooltip of the tab when the debugger is
-# displayed inside the developer tools window..
-# A keyboard shortcut for JS Debugger will be shown inside brackets.
-ToolboxDebugger.tooltip2=Debuger JavaScript (%S)
-
 # LOCALIZATION NOTE (ToolboxDebugger.tooltip3):
 # This string is displayed in the tooltip of the tab when the debugger is
 # displayed inside the developer tools window.
 ToolboxDebugger.tooltip3=Debuger JavaScript
 
+# LOCALIZATION NOTE (ToolboxDebugger.tooltip4):
+# This string is displayed in the tooltip of the tab when the debugger is
+# displayed inside the developer tools window.
+ToolboxDebugger.tooltip4=Debuger JavaScript (%S)
+
 # LOCALIZATION NOTE (debuggerMenu.accesskey)
 # Used for the menuitem in the tool menu
 debuggerMenu.accesskey=D
@@ -104,48 +103,6 @@
 # editor.
 open.accesskey=S
 
-# LOCALIZATION NOTE (ToolboxShaderEditor.label):
-# This string is displayed in the title of the tab when the Shader Editor is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxShaderEditor.label=Edytor shaderów
-
-# LOCALIZATION NOTE (ToolboxShaderEditor.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxShaderEditor.panelLabel=Panel edytora shaderów
-
-# LOCALIZATION NOTE (ToolboxShaderEditor.tooltip):
-# This string is displayed in the tooltip of the tab when the Shader Editor is
-# displayed inside the developer tools window.
-ToolboxShaderEditor.tooltip=Edytor języka shaderów GLSL dla WebGL
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.label):
-# This string is displayed in the title of the tab when the Shader Editor is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxCanvasDebugger.label=Canvas
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxCanvasDebugger.panelLabel=Panel canvas
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.tooltip):
-# This string is displayed in the tooltip of the tab when the Shader Editor is
-# displayed inside the developer tools window.
-ToolboxCanvasDebugger.tooltip=Narzędzia inspekcji i debugowania kontekstów <canvas>
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.label):
-# This string is displayed in the title of the tab when the Web Audio Editor
-# is displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxWebAudioEditor1.label=Web audio
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxWebAudioEditor1.panelLabel=Panel web audio
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.tooltip):
-# This string is displayed in the tooltip of the tab when the Web Audio Editor is
-# displayed inside the developer tools window.
-ToolboxWebAudioEditor1.tooltip=Przeglądarka i edytor kontekstów web audio
-
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
 inspector.label=Inspektor
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/client/toolbox.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/client/toolbox.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/client/toolbox.properties	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/client/toolbox.properties	2019-09-15 11:38:39.000000000 +0000
@@ -289,6 +289,18 @@
 # shown in the web replay timeline marker
 toolbox.replay.jumpMessage2=Przejdź do „%1$S”
 
+# LOCALIZATION NOTE (toolbox.replay.resume): This is the text that appears in the
+# Replay command bar to prompt the user to resume the program.
+toolbox.replay.resume=Wznów
+
+# LOCALIZATION NOTE (toolbox.replay.rewind): This is the text that appears in the
+# Replay command bar to prompt the user to rewind the program.
+toolbox.replay.rewind=Przewiń do tyłu
+
+# LOCALIZATION NOTE (toolbox.replay.pause): This is the text that appears in the
+# Replay command bar to prompt the user to pause the program.
+toolbox.replay.pause=Wstrzymaj
+
 # LOCALIZATION NOTE (toolbox.debugTargetErrorPage.title): This is the title
 # for the Error view shown by the toolbox when a connection to a debug target
 # could not be made
@@ -299,7 +311,7 @@
 # has happened while trying to connect to a debug target
 toolbox.debugTargetErrorPage.description = Nie można połączyć się z celem debugowania. Szczegóły błędu:
 
-# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the 
+# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the
 # settings panel for panel that will be removed in future releases.
 # This entire text is treated as a link to an MDN page.
 options.deprecationNotice=Przestarzałe. Więcej informacji…
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/startup/key-shortcuts.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/startup/key-shortcuts.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/devtools/startup/key-shortcuts.properties	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/devtools/startup/key-shortcuts.properties	2019-09-15 11:38:39.000000000 +0000
@@ -38,6 +38,10 @@
 # Key pressed to open a toolbox with the web console panel selected
 webconsole.commandkey=K
 
+# LOCALIZATION NOTE (jsdebugger.commandkey):
+# Key pressed to open a toolbox with the debugger panel selected
+jsdebugger.commandkey=L
+
 # LOCALIZATION NOTE (netmonitor.commandkey):
 # Key pressed to open a toolbox with the network monitor panel selected
 netmonitor.commandkey=E
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/dom/chrome/dom/dom.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/dom/chrome/dom/dom.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/dom/chrome/dom/dom.properties	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/dom/chrome/dom/dom.properties	2019-09-15 11:38:39.000000000 +0000
@@ -121,6 +121,7 @@
 MediaLoadInvalidURI=Nieprawidłowy adres URI. Treść multimedialna „%S” nie została wczytana.
 # LOCALIZATION NOTE: %1$S is the media resource's format/codec type (basically equivalent to the file type, e.g. MP4,AVI,WMV,MOV etc), %2$S is the URL of the media resource which failed to load.
 MediaLoadUnsupportedTypeAttribute=Podany typ (atrybut „type”) formatu „%1$S” nie jest obsługiwany. Wczytanie zasobu multimedialnego „%2$S” się nie powiodło.
+MediaLoadUnsupportedTypeAttributeLoadingNextChild=Podany typ (atrybut „type”) formatu „%1$S” nie jest obsługiwany. Wczytanie zasobu multimedialnego „%2$S” się nie powiodło. Próbowanie wczytania z następnego elementu <source>.
 # LOCALIZATION NOTE: %1$S is the "media" attribute value of the <source> element. It is a media query. %2$S is the URL of the media resource which failed to load.
 MediaLoadSourceMediaNotMatched=Podana wartość „%1$S” atrybutu „media” nie pasuje do środowiska. Wczytanie zasobu multimedialnego „%2$S” się nie powiodło.
 # LOCALIZATION NOTE: %1$S is the MIME type HTTP header being sent by the web server, %2$S is the URL of the media resource which failed to load.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/toolkit/toolkit/about/certviewer.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:38:39.000000000 +0000
@@ -0,0 +1,57 @@
+# 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/.
+
+certificate-viewer-certificate-section-title = Certyfikat
+
+## Error messages
+
+certificate-viewer-error-message = Nie można odnaleźć informacji o certyfikacie lub certyfikat jest uszkodzony. Proszę spróbować ponownie.
+certificate-viewer-error-title = Coś się nie powiodło.
+
+## Certificate information labels
+
+certificate-viewer-algorithm = Algorytm
+certificate-viewer-certificate-authority = Organ certyfikacji
+certificate-viewer-cipher-suite = Szyfr
+certificate-viewer-common-name = Nazwa pospolita
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-country = Państwo założenia
+certificate-viewer-country = Państwo
+certificate-viewer-curve = Krzywa
+certificate-viewer-distribution-point = Punkt dystrybucji
+certificate-viewer-dns-name = Nazwa DNS
+certificate-viewer-exponent = Wykładnik
+certificate-viewer-id = Identyfikator
+certificate-viewer-key-exchange-group = Grupa wymiany kluczy
+certificate-viewer-key-id = Identyfikator klucza
+certificate-viewer-key-size = Rozmiar klucza
+certificate-viewer-locality = Region
+certificate-viewer-location = Położenie
+certificate-viewer-logid = Identyfikator dziennika
+certificate-viewer-method = Metoda
+certificate-viewer-modulus = Modulo
+certificate-viewer-name = Nazwa
+certificate-viewer-not-after = Nieważny po
+certificate-viewer-not-before = Nieważny przed
+certificate-viewer-organization = Organizacja
+certificate-viewer-organizational-unit = Jednostka organizacyjna
+certificate-viewer-policy = Zasady
+certificate-viewer-protocol = Protokół
+certificate-viewer-public-value = Wartość publiczna
+certificate-viewer-purposes = Zastosowania
+certificate-viewer-qualifier = Kwalifikator
+certificate-viewer-qualifiers = Kwalifikatory
+certificate-viewer-required = Wymagane
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-state-province = Województwo założenia
+certificate-viewer-state-province = Województwo
+certificate-viewer-sha-1 = SHA-1
+certificate-viewer-sha-256 = SHA-256
+certificate-viewer-serial-number = Numer seryjny
+certificate-viewer-signature-algorithm = Algorytm podpisu
+certificate-viewer-signature-scheme = Schemat podpisu
+certificate-viewer-timestamp = Czas
+certificate-viewer-value = Wartość
+certificate-viewer-version = Wersja
+certificate-viewer-business-category = Rodzaj firmy
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/toolkit/toolkit/global/processTypes.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/toolkit/toolkit/global/processTypes.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pl/toolkit/toolkit/global/processTypes.ftl	2019-09-13 05:17:59.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pl/toolkit/toolkit/global/processTypes.ftl	2019-09-15 11:38:39.000000000 +0000
@@ -18,6 +18,9 @@
 # process used to isolate webpages that requested special
 # permission to allocate large amounts of memory
 process-type-weblargeallocation = Duży przydział pamięci
+# process used to isolate a webpage from other web pages
+# to improve security
+process-type-webisolated = Wydzielone strony
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/browser/aboutLogins.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/browser/aboutLogins.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/browser/aboutLogins.ftl	2019-09-13 05:18:02.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/browser/aboutLogins.ftl	2019-09-15 11:38:46.000000000 +0000
@@ -20,8 +20,8 @@
 #   $title (String) - The title of the website associated with the favicon.
 login-favicon =
     .alt = Favicon de { $title }
-fxaccounts-sign-in-text = Tenha suas senhas em seus outros dispositivos
-fxaccounts-sign-in-button = Entre no { -sync-brand-short-name }
+fxaccounts-sign-in-text = Tenha suas senhas em outros dispositivos
+fxaccounts-sign-in-button = Entrar no { -sync-brand-short-name }
 fxaccounts-avatar-button =
     .title = Gerenciar conta
 
@@ -68,7 +68,7 @@
 login-intro-description = Se você salvou suas contas no { -brand-product-name } em outro dispositivo, veja como tê-las aqui:
 login-intro-instruction-fxa = Crie ou entre na sua { -fxaccount-brand-name } no dispositivo onde suas contas estão salvas
 login-intro-instruction-fxa-settings = Selecione a opção 'Contas de acesso' nas configurações do { -sync-brand-short-name }
-about-logins-intro-instruction-help = Visite o <a data-l10n-name="help-link">{ -lockwise-brand-short-name } Suporte</a> para mais ajuda
+about-logins-intro-instruction-help = Visite o <a data-l10n-name="help-link">suporte do { -lockwise-brand-short-name }</a> para mais ajuda
 
 ## Login
 
@@ -79,8 +79,6 @@
 login-item-origin =
     .placeholder = https://www.example.com
 login-item-username-label = Nome de usuário
-login-item-username =
-    .placeholder = nome@example.com
 about-logins-login-item-username =
     .placeholder = (sem nome de usuário)
 login-item-copy-username-button-text = Copiar
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/browser/appMenuNotifications.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/browser/appMenuNotifications.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/browser/appMenuNotifications.ftl	2019-09-13 05:18:02.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/browser/appMenuNotifications.ftl	2019-09-15 11:38:46.000000000 +0000
@@ -37,7 +37,7 @@
     .buttonaccesskey = O
 appmenu-addon-post-install-message = Gerencie extensões clicando em <image data-l10n-name='addon-install-icon'></image> no menu <image data-l10n-name='addon-menu-icon'></image>
 appmenu-addon-post-install-incognito-checkbox =
-    .label = Permitir esta extensão funcionar em janelas privativas
+    .label = Permitir esta extensão em janelas privativas
     .accesskey = P
 appmenu-addon-private-browsing =
     .label = Alteração de extensões em janelas privativas
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/browser/newtab/asrouter.ftl	2019-09-13 05:18:02.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/browser/newtab/asrouter.ftl	2019-09-15 11:38:46.000000000 +0000
@@ -101,7 +101,7 @@
 cfr-whatsnew-tracking-blocked-subtitle = Desde { DATETIME($earliestDate, month: "long", year: "numeric") }
 cfr-whatsnew-tracking-blocked-link-text = Ver relatório
 cfr-whatsnew-lockwise-backup-title = Guarde uma cópia de suas senhas
-cfr-whatsnew-lockwise-backup-body = Agora gera senhas seguras que você pode ter onde quer que acesse.
+cfr-whatsnew-lockwise-backup-body = Gere senhas seguras que você pode acessar em qualquer dispositivo.
 cfr-whatsnew-lockwise-backup-link-text = Ativar cópias de segurança
 cfr-whatsnew-lockwise-take-title = Leve suas senhas com você
 cfr-whatsnew-lockwise-take-body = O aplicativo de celular { -lockwise-brand-short-name } permite acessar com segurança em qualquer lugar suas senhas guardadas.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/browser/protections.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/browser/protections.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/browser/protections.ftl	2019-09-13 05:18:02.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/browser/protections.ftl	2019-09-15 11:38:46.000000000 +0000
@@ -13,15 +13,6 @@
 #   $count (Number) - Number of tracking events blocked.
 #   $earliestDate (Number) - Unix timestamp in ms, representing a date. The
 # earliest date recorded in the database.
-graph-total-summary =
-    { $count ->
-        [one] { $count } rastreador bloqueado desde { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
-       *[other] { $count } rastreadores bloqueados desde { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
-    }
-# Variables:
-#   $count (Number) - Number of tracking events blocked.
-#   $earliestDate (Number) - Unix timestamp in ms, representing a date. The
-# earliest date recorded in the database.
 graph-total-tracker-summary =
     { $count ->
         [one] <b>{ $count }</b> rastreador bloqueado desde { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
@@ -47,7 +38,6 @@
 cookie-tab-title = Cookies de rastreamento entre sites
 cookie-tab-content = Esses cookies seguem você de um site para outro para coletar dados sobre o que você faz online. Eles são criados por terceiros, como anunciantes e empresas de análises. Bloquear cookies de rastreamento entre sites reduz o número de anúncios que seguem você por todo canto. <a data-l10n-name="learn-more-link">Saiba mais</a>
 tracker-tab-title = Conteúdo de rastreamento
-tracker-tab-content = Sites podem carregar anúncios, vídeos e outros conteúdos externos que contêm código de rastreamento. Bloquear conteúdo de rastreamento pode ajudar a agilizar o carregamento de sites, mas alguns botões, formulários e campos de acesso a contas podem não funcionar. <a data-l10n-name="learn-more-link">Saiba mais</a>
 tracker-tab-description = Sites podem carregar anúncios, vídeos e outros conteúdos externos com código de rastreamento. Bloquear conteúdo de rastreamento pode ajudar a agilizar o carregamento de sites, mas alguns botões, formulários e campos de acesso a contas podem não funcionar. <a data-l10n-name="learn-more-link">Saiba mais</a>
 fingerprinter-tab-title = Fingerprinters
 fingerprinter-tab-content = Fingerprinters coletam configurações do seu navegador e do computador para traçar um perfil seu. Usando esta identidade digital, eles podem rastrear você por vários sites. <a data-l10n-name="learn-more-link">Saiba mais</a>
@@ -57,7 +47,6 @@
 lockwise-title-logged-in = { -lockwise-brand-name }
 lockwise-header-content = O { -lockwise-brand-name } armazena com segurança suas senhas em seu navegador.
 lockwise-header-content-logged-in = Armazene e sincronize suas senhas com segurança em todos os seus dispositivos.
-open-about-logins-button = Abrir no { -brand-short-name }
 about-logins-view-logins-button = Ver contas de acesso
 lockwise-no-logins-content = Instale o aplicativo <a data-l10n-name="lockwise-inline-link">{ -lockwise-brand-name }</a> para ter suas senhas em qualquer lugar.
 # This string is displayed after a large numeral that indicates the total number
@@ -78,12 +67,9 @@
         [one] Sincronizando com { $count } outro dispositivo
        *[other] Sincronizando com { $count } outros dispositivos
     }
-lockwise-sync-not-syncing = Não sincronizando com outros dispositivos.
 lockwise-sync-not-syncing-devices = Não sincronizando com outros dispositivos
-monitor-title = Fique atento a violações de dados
+monitor-title = Fique atento a vazamentos de dados
 monitor-link = Como funciona
-monitor-header-content = Veja no { -monitor-brand-name } se você foi vítima de um vazamento de dados e receba alertas sobre novos vazamentos.
-monitor-header-content-logged-in = O { -monitor-brand-name } avisa caso suas informações apareçam em um vazamento de dados conhecido
 monitor-header-content-no-account = Veja no { -monitor-brand-name } se você foi vítima de um vazamento de dados conhecido e receba alertas sobre novos vazamentos.
 monitor-header-content-signed-in = O { -monitor-brand-name } avisa caso suas informações apareçam em um vazamento de dados conhecido.
 monitor-sign-up = Cadastre-se para receber alertas de vazamentos
@@ -91,30 +77,6 @@
 # This string is displayed after a large numeral that indicates the total number
 # of email addresses being monitored. Don’t add $count to
 # your localization, because it would result in the number showing twice.
-info-monitored-addresses =
-    { $count ->
-        [one] Endereço de e-mail sendo monitorado.
-       *[other] Endereços de e-mail sendo monitorados.
-    }
-# This string is displayed after a large numeral that indicates the total number
-# of known data breaches. Don’t add $count to
-# your localization, because it would result in the number showing twice.
-info-known-breaches =
-    { $count ->
-        [one] Vazamento de dados conhecido expôs suas informações.
-       *[other] Vazamentos de dados conhecidos expuseram suas informações.
-    }
-# This string is displayed after a large numeral that indicates the total number
-# of exposed passwords. Don’t add $count to
-# your localization, because it would result in the number showing twice.
-info-exposed-passwords =
-    { $count ->
-        [one] Senha exposta em meio a todos os vazamentos.
-       *[other] Senhas expostas em meio a todos os vazamentos.
-    }
-# This string is displayed after a large numeral that indicates the total number
-# of email addresses being monitored. Don’t add $count to
-# your localization, because it would result in the number showing twice.
 info-monitored-emails =
     { $count ->
         [one] Endereço de e-mail sendo monitorado.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/browser/tabContextMenu.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/browser/tabContextMenu.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/browser/tabContextMenu.ftl	2019-09-13 05:18:02.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/browser/tabContextMenu.ftl	2019-09-15 11:38:46.000000000 +0000
@@ -36,13 +36,13 @@
     .label = Desafixar abas
     .accesskey = b
 bookmark-selected-tabs =
-    .label = Adicionar abas a favoritos…
+    .label = Adicionar abas aos favoritos…
     .accesskey = f
 bookmark-tab =
-    .label = Adicionar aba
+    .label = Adicionar aba aos favoritos
     .accesskey = A
 reopen-in-container =
-    .label = Reabrir em contêiner
+    .label = Reabrir em um contêiner
     .accesskey = e
 move-to-start =
     .label = Mover para o início
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/browser/chrome/browser/browser.dtd	2019-09-13 05:18:02.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/browser/chrome/browser/browser.dtd	2019-09-15 11:38:46.000000000 +0000
@@ -337,7 +337,7 @@
 <!ENTITY webDeveloperMenu.accesskey   "W">
 
 <!ENTITY inspectContextMenu.label     "Inspecionar Elemento">
-<!ENTITY inspectContextMenu.accesskey "I">
+<!ENTITY inspectContextMenu.accesskey "Q">
 
 <!ENTITY inspectA11YContextMenu.label     "Inspecionar propriedades de acessibilidade">
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/dom/chrome/layout/HtmlForm.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/dom/chrome/layout/HtmlForm.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/pt-BR/dom/chrome/layout/HtmlForm.properties	2019-09-13 05:18:02.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/pt-BR/dom/chrome/layout/HtmlForm.properties	2019-09-15 11:38:46.000000000 +0000
@@ -5,7 +5,7 @@
 Reset=Reset
 Submit=Submit Query
 Browse=Browse…
-FileUpload=File Upload
+FileUpload=Enviar arquivo(s)
 DirectoryUpload=Select Folder to Upload
 DirectoryPickerOkButtonLabel=Upload
 ForgotPostWarning=Form contains enctype=%S, but does not contain method=post.  Submitting normally with method=GET and no enctype instead.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/aboutConfig.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/aboutConfig.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/aboutConfig.ftl	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/aboutConfig.ftl	2019-09-15 11:38:54.000000000 +0000
@@ -10,6 +10,8 @@
 about-config2-title = Configuraziuns avanzadas
 about-config-search-input =
     .placeholder = Tschertgar
+about-config-search-input1 =
+    .placeholder = Tschertgar in num dad ina preferenza
 about-config-show-all = Mussar tut
 about-config-pref-add = Agiuntar
 about-config-pref-toggle = Alternar
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/newtab/asrouter.ftl	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/newtab/asrouter.ftl	2019-09-15 11:38:54.000000000 +0000
@@ -132,3 +132,16 @@
 cfr-doorhanger-firefox-send-header = Cundivida quest PDF a moda segira
 cfr-doorhanger-firefox-send-ok-button = Emprova { -send-brand-name }
     .accesskey = E
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Vesair las protecziuns
+    .accesskey = p
+cfr-doorhanger-socialtracking-close-button = Serrar
+    .accesskey = S
+cfr-doorhanger-socialtracking-heading = { -brand-short-name } ha fermà qua ina rait sociala che fastizescha
+cfr-doorhanger-socialtracking-description = La protecziun da datas è impurtanta. { -brand-short-name } blochescha ussa fastizaders frequents da social media e limitescha la quantitad da datas che po vegnir rimnada davart tias activitads online.
+cfr-doorhanger-fingerprinters-heading = { -brand-short-name } ha bloccà in improntader sin questa pagina
+cfr-doorhanger-fingerprinters-description = La protecziun da datas è impurtanta. { -brand-short-name } blochescha ussa improntaders che rimnan infurmaziuns univocas che permettan dad identifitgar tes apparat per ta fastizar.
+cfr-doorhanger-cryptominers-heading = { -brand-short-name } ha bloccà in criptominier sin questa pagina
+cfr-doorhanger-cryptominers-description = La protecziun da datas è impurtanta. { -brand-short-name } blochescha ussa criptominiers che maldovran las resursas da tes computer per generar daners digitals.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/newtab/onboarding.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/newtab/onboarding.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/newtab/onboarding.ftl	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/newtab/onboarding.ftl	2019-09-15 11:38:54.000000000 +0000
@@ -103,11 +103,20 @@
 # "Mobile" is short for mobile/cellular phone, "Browser" is short for web
 # browser.
 onboarding-mobile-phone-button = Telechargiar il navigatur mobil
+onboarding-send-tabs-title = Trametta tabs averts a tes auters apparats
 # "Send Tabs" refers to "Send Tab to Device" feature that appears when opening a
 # tab's context menu.
 onboarding-send-tabs-text = «Trametter il tab» pussibilitescha da cundivider immediatamain paginas cun auters apparats, senza stuair copiar & encollar u bandunar il navigatur.
 onboarding-send-tabs-button = Cumenzar ad utilisar «Trametter il tab»
 onboarding-pocket-anywhere-title = Leger e tadlar nua ch'i saja
+onboarding-pocket-anywhere-text2 = Memorisescha tes cuntegns preferids en l'app { -pocket-brand-name } e legia, taidla e guarda cura e sco ch'i para e plascha – era senza connexiun cun l'internet.
+onboarding-pocket-anywhere-button = Emprova { -pocket-brand-name }
+onboarding-lockwise-passwords-title = Prenda tes pleds-clav cun tai – dapertut
+onboarding-lockwise-passwords-text2 = Protegia ils pleds-clav che ti memoriseschas e t'annunzia tuttina a moda simpla en tes contos cun { -lockwise-brand-name }.
+onboarding-lockwise-passwords-button2 = Ir per l'app
+onboarding-facebook-container-title = Mussa ils cunfins a Facebook
+onboarding-facebook-container-text2 = { -facebook-container-brand-name } separa tes profil da tut il rest per render pli grev a Facebook da ta mussar reclama individualisada.
+onboarding-facebook-container-button = Agiuntar l'extensiun
 
 ## Message strings belonging to the Return to AMO flow
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/pageInfo.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/pageInfo.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/pageInfo.ftl	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/pageInfo.ftl	2019-09-15 11:38:54.000000000 +0000
@@ -14,8 +14,8 @@
 menu-select-all =
     .label = Selecziunar tut
     .accesskey = a
-close-window =
-    .key = A
+close-dialog =
+    .key = w
 general-tab =
     .label = General
     .accesskey = G
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/policies/policies-descriptions.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/policies/policies-descriptions.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/policies/policies-descriptions.ftl	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/policies/policies-descriptions.ftl	2019-09-15 11:38:54.000000000 +0000
@@ -53,7 +53,9 @@
 # takes 3 keys (“Install”, ”Uninstall”, ”Locked”), you can either keep them in
 # English or translate them as verbs.
 policy-Extensions = Installar, deinstallar u bloccar extensiuns. L'opziun «Installar» pretenda URLs u percurs sco parameters. Las opziuns «Deinstallar» e «Bloccar» pretendan IDs dad extensiuns.
+policy-ExtensionSettings = Administrar tut ils aspects da l'installaziun dad extensiuns.
 policy-ExtensionUpdate = Activar u deactivar actualisaziuns automaticas dad extensiuns.
+policy-FirefoxHome = Configurar la pagina da partenza da Firefox.
 policy-FlashPlugin = Permetter u scumandar l'utilisaziun dal plug-in Flash.
 policy-HardwareAcceleration = Sche «false», deactivar l'acceleraziun cun agid da la hardware.
 # “lock” means that the user won’t be able to change this setting
@@ -64,8 +66,10 @@
 policy-NewTabPage = Activar u deactivar la pagina «Nov tab».
 policy-NoDefaultBookmarks = Deactivar la creaziun dals segnapaginas predefinids da { -brand-short-name } ed ils segnapaginas intelligents (Visità il pli savens, Chavazzins utilisads dacurt). Remartga: questa directiva ha mo effect sch'ella vegn utilisada avant ch'il profil vegn avert l'emprima giada.
 policy-OfferToSaveLogins = Gestiunar la dumonda en { -brand-short-name } da memorisar las infurmaziuns d'annunzia. Omaduas valurs, «true» e «false», èn validas.
+policy-OfferToSaveLoginsDefault = Definir la valur da standard per permetter a { -brand-short-name } da proponer da memorisar infurmaziuns d'annunzia. Omaduas valurs, «true» e «false», èn validas.
 policy-OverrideFirstRunPage = Surscriver la pagina che vegn mussada suenter avair avià l'emprima giada. Definir questa directiva cun ina valur vida per deactivar la pagina.
 policy-OverridePostUpdatePage = Surscriver la pagina «What's New» che vegn mussada suenter actualisaziuns. Definir questa directiva cun ina valur vida per impedir che la pagina vegnia mussada.
+policy-PasswordManagerEnabled = Activar la memorisaziun da pleds-clav en l'administraziun da pleds-clav.
 policy-Permissions = Configurar permissiuns per camera, microfon, posiziun e notificaziuns.
 policy-PopupBlocking = Permetter a tschertas websites da mussar popups sco standard.
 policy-Preferences = Definescha e fixescha la valur per ina subgruppa da preferenzas.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/preferences/connection.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/preferences/connection.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/preferences/connection.ftl	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/preferences/connection.ftl	2019-09-15 11:38:54.000000000 +0000
@@ -54,6 +54,8 @@
 connection-proxy-noproxy = Nagin proxy per
     .accesskey = N
 connection-proxy-noproxy-desc = Exempel: .mozilla.org, .giuru.ch, 192.168.1.0/24
+# Do not translate localhost, 127.0.0.1 and ::1.
+connection-proxy-noproxy-localhost-desc = Las connexiuns cun localhost, 127.0.0.1 ed ::1 n'utiliseschan mai in proxy.
 connection-proxy-autotype =
     .label = URL per la configuraziun automatica dal proxy
     .accesskey = a
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/preferences/permissions.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/preferences/permissions.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/preferences/permissions.ftl	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/preferences/permissions.ftl	2019-09-15 11:38:54.000000000 +0000
@@ -34,8 +34,15 @@
 permissions-button-ok =
     .label = Memorisar las midadas
     .accesskey = M
+permissions-autoplay-menu = Standard per tuttas websites:
 permissions-searchbox =
     .placeholder = Tschertgar ina website
+permissions-capabilities-autoplay-allow =
+    .label = Permetter audio e video
+permissions-capabilities-autoplay-block =
+    .label = Bloccar l'audio
+permissions-capabilities-autoplay-blockall =
+    .label = Bloccar audio e video
 permissions-capabilities-allow =
     .label = Permetter
 permissions-capabilities-block =
@@ -46,8 +53,6 @@
     .value = Permetter
 permissions-capabilities-listitem-block =
     .value = Bloccar
-permissions-capabilities-listitem-allow-first-party =
-    .value = Mo permetter per la domena principala
 permissions-capabilities-listitem-allow-session =
     .value = Permetter per questa sesida
 
@@ -58,14 +63,14 @@
 
 ## Exceptions - Tracking Protection
 
-permissions-exceptions-tracking-protection-window =
-    .title = Excepziuns - Protecziun cunter il fastizar
-    .style = { permissions-window.style }
-permissions-exceptions-tracking-protection-desc = Ti has deactivà la protecziun cunter il fastizar sin questas websites.
 permissions-exceptions-content-blocking-window =
     .title = Excepziuns - Bloccada da cuntegn
     .style = { permissions-window.style }
 permissions-exceptions-content-blocking-desc = Ti has deactivà la bloccada da cuntegn sin questas websites.
+permissions-exceptions-etp-window =
+    .title = Excepziuns per la protecziun avanzada cunter il fastizar
+    .style = { permissions-window.style }
+permissions-exceptions-etp-desc = Ti has deactivà las protecziuns sin questas websites.
 
 ## Exceptions - Cookies
 
@@ -102,6 +107,13 @@
     .style = { permissions-window.style }
 permissions-exceptions-autoplay-media-desc2 = Ti pos definir a tge websites che ti permettas adina u mai da reproducir automaticamain multimedia cun tun. Inditgescha l'adressa exacta da la website che ti vuls administrar e clicca lura sin «Bloccar» u «Permetter».
 
+## Site Permissions - Autoplay
+
+permissions-site-autoplay-window =
+    .title = Preferenzas - Reproducziun automatica
+    .style = { permissions-window.style }
+permissions-site-autoplay-desc = Ti pos administrar qua las websites che na resguardan betg tias preferenzas per la reproducziun automatica.
+
 ## Site Permissions - Notifications
 
 permissions-site-notification-window =
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/browser/browser/preferences/preferences.ftl	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/browser/browser/preferences/preferences.ftl	2019-09-15 11:38:54.000000000 +0000
@@ -29,6 +29,7 @@
             [windows] Tschertgar en las preferenzas
            *[other] Tschertgar en las preferenzas
         }
+managed-notice = Tes navigatur vegn administrà da tia organisaziun.
 pane-general-title = General
 category-general =
     .tooltiptext = { pane-general-title }
@@ -284,6 +285,11 @@
 # Variables:
 #   $path (String) - Path to the configuration file
 update-pref-write-failure-message = Errur durant memorisar la preferenza. Impussibel da scriver en la datoteca: { $path }
+update-setting-write-failure-title = Errur cun memorisar preferenzas per actualisaziuns
+update-in-progress-ok-button = &Annullar
+# Continue is the cancel button so pressing escape or using a platform standard
+# method of closing the UI will not discard the update.
+update-in-progress-cancel-button = &Cuntinuar
 
 ## General Section - Performance
 
@@ -323,6 +329,10 @@
 browsing-search-on-start-typing =
     .label = Retschertgar il text cura che ti cumenzas a tippar
     .accesskey = x
+browsing-picture-in-picture-toggle-enabled =
+    .label = Activar las controllas per maletg-en-maletg
+    .accesskey = A
+browsing-picture-in-picture-learn-more = Ulteriuras infurmaziuns
 browsing-cfr-recommendations =
     .label = Recumandar extensiuns durant la navigaziun
     .accesskey = R
@@ -709,6 +719,13 @@
 content-blocking-custom-desc = Tscherna tge bloccar.
 content-blocking-private-trackers = Fastizaders enconuschents mo en il modus privat
 content-blocking-third-party-cookies = Cookies che fastizeschan da terzas partidas
+
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
+
+
+
 content-blocking-all-cookies = Tut ils cookies
 content-blocking-unvisited-cookies = Cookies da websites betg visitadas
 content-blocking-all-windows-trackers = Fastizaders enconuschents en tut las fanestras
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/accessibility.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/accessibility.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/accessibility.ftl	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/accessibility.ftl	2019-09-15 11:38:54.000000000 +0000
@@ -7,6 +7,7 @@
 
 accessibility-learn-more = Learn more
 accessibility-text-label-header = Text Labels and Names
+accessibility-keyboard-header = Keyboard
 
 ## Text entries that are used as text alternative for icons that depict accessibility isses.
 
@@ -41,3 +42,14 @@
 accessibility-text-label-issue-optgroup-label = Use <code>label</code> attribute to label <span>optgroup</span> elements. <a>Learn more</a>
 accessibility-text-label-issue-optgroup-label2 = Use a <code>label</code> attribute to label an <span>optgroup</span>. <a>Learn more</a>
 accessibility-text-label-issue-toolbar = Toolbars must be labeled when there is more than one toolbar. <a>Learn more</a>
+
+## Text entries for a paragraph used in the accessibility panel sidebar's checks section
+## that describe that currently selected accessible object has a keyboard accessibility
+## issue.
+
+accessibility-keyboard-issue-semantics = Focusable elements should have interactive semantics. <a>Learn more</a>
+accessibility-keyboard-issue-tabindex = Avoid using <code>tabindex</code> attribute greater than zero. <a>Learn more</a>
+accessibility-keyboard-issue-action = Interactive elements must be able to be activated using a keyboard. <a>Learn more</a>
+accessibility-keyboard-issue-focusable = Interactive elements must be focusable. <a>Learn more</a>
+accessibility-keyboard-issue-focus-visible = Focusable element may be missing focus styling. <a>Learn more</a>
+accessibility-keyboard-issue-mouse-only = Clickable elements must be focusable and should have interactive semantics. <a>Learn more</a>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/accessibility.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/accessibility.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/accessibility.properties	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/accessibility.properties	2019-09-15 11:38:54.000000000 +0000
@@ -152,6 +152,12 @@
 # run time with the accessibility.learnMore string.
 accessibility.contrast.annotation.fail=Does not meet WCAG standards for accessible text. %S
 
+# LOCALIZATION NOTE (accessibility.contrast.annotation.FAIL): A title text for the
+# paragraph describing that the given colour contrast fails to meet the minimum level from
+# Web Content Accessibility Guidelines. %S in the content will be replaced by a link at
+# run time with the accessibility.learnMore string.
+accessibility.contrast.annotation.FAIL=Does not meet WCAG standards for accessible text. %S
+
 # LOCALIZATION NOTE (accessibility.contrast.annotation.transparent.error): A title text for the
 # paragraph suggesting a fix for error in color contrast calculation for text nodes with zero alpha.
 accessibility.contrast.annotation.transparent.error=Pick a color that is not transparent.
@@ -168,7 +174,8 @@
 
 # LOCALIZATION NOTE (accessibility.filter.none): A title text for the filter
 # that is rendered within the accessibility panel toolbar for a menu item that
-# resets all filtering in tree.
+# resets all filtering in tree, and for the simulation menu item that resets
+# applied color matrices to the default matrix.
 accessibility.filter.none=None
 
 # LOCALIZATION NOTE (accessibility.filter.all2): A title text for the filter
@@ -186,6 +193,11 @@
 # filters the tree based on text label and name accessibility failures within it.
 accessibility.filter.textLabel=Text Labels
 
+# LOCALIZATION NOTE (accessibility.filter.keyboard): A title text for the filter
+# that is rendered within the accessibility panel toolbar for a menu item that
+# filters the tree based on keyboard accessibility failures within it.
+accessibility.filter.keyboard=Keyboard
+
 # LOCALIZATION NOTE (accessibility.badge.contrast): A title text for the badge
 # that is rendered within the accessible row in the accessibility tree for a
 # given accessible object that does not satisfy the WCAG guideline for colour
@@ -198,6 +210,12 @@
 # WCAG guideline for colour contrast.
 accessibility.badge.contrast.warning=contrast warning
 
+# LOCALIZATION NOTE (accessibility.badge.keyboard): A title text for the
+# badge that is rendered within the accessible row in the accessibility tree for
+# a given accessible object that does not satisfy the WCAG guideline for
+# keyboard accessibility.
+accessibility.badge.keyboard=keyboard
+
 # LOCALIZATION NOTE (accessibility.badge.textLabel): A title text for the
 # badge that is rendered within the accessible row in the accessibility tree for
 # a given accessible object that does not satisfy the WCAG guideline for text
@@ -210,6 +228,12 @@
 # satisfy the WCAG guideline for colour contrast.
 accessibility.badge.contrast.tooltip=Does not meet WCAG standards for accessible text.
 
+# LOCALIZATION NOTE (accessibility.badge.keyboard.tooltip): A title text
+# for the badge tooltip that is rendered on mouse hover over the badge in the
+# accessible row in the accessibility tree for a given accessible object that
+# does not satisfy the WCAG guideline for keyboard accessibility.
+accessibility.badge.keyboard.tooltip=Does not meet WCAG standards for keyboard accessibility.
+
 # LOCALIZATION NOTE (accessibility.badge.textLabel.tooltip): A title text
 # for the badge tooltip that is rendered on mouse hover over the badge in the
 # accessible row in the accessibility tree for a given accessible object that
@@ -256,3 +280,38 @@
 # LOCALIZATION NOTE (accessibility.documentation.label): This is the label for
 # the Documentation menu item.
 accessibility.documentation.label=Documentation…
+
+# LOCALIZATION NOTE (accessibility.simulation): A title text for the toolbar
+# within the main accessibility panel that contains a list of simulations for
+# vision deficiencies.
+accessibility.simulation=Simulate:
+
+# LOCALIZATION NOTE (accessibility.simulation.deuteranomaly): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the deuteranomaly simulation option.
+accessibility.simulation.deuteranomaly=Deuteranomaly (low green)
+
+# LOCALIZATION NOTE (accessibility.simulation.protanomaly): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the protanomaly simulation option.
+accessibility.simulation.protanomaly=Protanomaly (low red)
+
+# LOCALIZATION NOTE (accessibility.simulation.protanopia): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the protanopia simulation option.
+accessibility.simulation.protanopia=Protanopia (no red)
+
+# LOCALIZATION NOTE (accessibility.simulation.deuteranopia): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the deuteranopia simulation option.
+accessibility.simulation.deuteranopia=Deuteranopia (no green)
+
+# LOCALIZATION NOTE (accessibility.simulation.tritanopia): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the tritanopia simulation option.
+accessibility.simulation.tritanopia=Tritanopia (no blue)
+
+# LOCALIZATION NOTE (accessibility.simulation.tritanomaly): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the tritanomaly simulation option.
+accessibility.simulation.tritanomaly=Tritanomaly (low blue)
+
+# LOCALIZATION NOTE (accessibility.simulation.contrastLoss): This label is shown
+# in the "Simulate" menu in the accessibility panel and represent the contrast loss simulation option.
+# It is also shown in the simulation menu button in the accessibility panel and represent the
+# contrast loss simulation option currently selected.
+accessibility.simulation.contrastLoss=Contrast loss
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/application.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/application.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/application.ftl	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/application.ftl	2019-09-15 11:38:54.000000000 +0000
@@ -69,5 +69,40 @@
 # Suggestion to go to about:debugging in order to see Service Workers for all domains.
 # Clicking on the link will open about:debugging in a new tab.
 serviceworker-empty-suggestions-aboutdebugging = Inspect Service Workers from other domains. <a>Open about:debugging</a>
-# Text displayed when no manifest was found for the current page.
+# Header for the Manifest page when we have an actual manifest
+manifest-view-header = App Manifest
+# Header for the Manifest page when there's no manifest to inspect
+# The link will open https://developer.mozilla.org/en-US/docs/Web/Manifest
 manifest-empty-intro = No manifest found to inspect.
+# Header for the Errors and Warnings section of Manifest inspection displayed in the application panel.
+manifest-item-warnings = Errors and Warnings
+# Header for the Identity section of Manifest inspection displayed in the application panel.
+manifest-item-identity = Identity
+# Header for the Presentation section of Manifest inspection displayed in the application panel.
+manifest-item-presentation = Presentation
+# Header for the Icon section of Manifest inspection displayed in the application panel.
+manifest-item-icons = Icons
+# Text displayed while we are loading the manifest file
+manifest-loading = Loading manifest…
+# Text displayed when the manifest has been successfully loaded
+manifest-loaded-ok = Manifest loaded.
+# Text displayed when there has been an error while trying to load the manifest
+manifest-loaded-error = There was an error while loading the manifest:
+# Text displayed when the page has no manifest available
+manifest-non-existing = No manifest found to inspect.
+# Sidebar navigation item for Manifest sidebar item section
+sidebar-item-manifest = Manifest
+    .alt = Manifest Icon
+    .title = Manifest
+# Sidebar navigation item for Service Workers sidebar item section
+sidebar-item-service-workers = Service Workers
+    .alt = Service Workers Icon
+    .title = Service Workers
+# Text for the ALT and TITLE attributes of the warning icon
+icon-warning =
+    .alt = Warning icon
+    .title = Warning
+# Text for the ALT and TITLE attributes of the error icon
+icon-error =
+    .alt = Error icon
+    .title = Error
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/debugger.properties	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/debugger.properties	2019-09-15 11:38:54.000000000 +0000
@@ -218,6 +218,18 @@
 # source.
 blackboxCheckboxTooltip2=Toggle blackboxing
 
+# LOCALIZATION NOTE (noDomMutationBreakpoints): The text to
+# display in the DOM Mutation Breakpoints pane when there are no events.
+# %S will be replaced by an active link using inspectorTool as text
+noDomMutationBreakpoints=Right click an element in the %S and select “Break on…” to add a breakpoint
+
+# LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
+inspectorTool=Inspector
+
+# LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
+# the event search input bar
+eventListenersHeader1.placeholder=Filter by event type
+
 # LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
 # DOM Mutation Breakpoints pane when there are no events.
 noDomMutationBreakpointsText=No breakpoints to display.
@@ -430,6 +442,8 @@
 breakpointMenuItem.disableSelf2.accesskey=D
 breakpointMenuItem.deleteSelf2.label=Remove
 breakpointMenuItem.deleteSelf2.accesskey=R
+breakpointMenuItem.disabledbg.label=Never pause here
+breakpointMenuItem.enabledbg.label=Pause here
 breakpointMenuItem.enableOthers2.label=Enable others
 breakpointMenuItem.enableOthers2.accesskey=o
 breakpointMenuItem.disableOthers2.label=Disable others
@@ -633,6 +647,14 @@
 downloadFile.label=Download file
 downloadFile.accesskey=d
 
+# LOCALIZATION NOTE (inlinePreview.show.label): Context menu item
+# for showing the inline preview blocks
+inlinePreview.show.label=Show inline preview
+
+# LOCALIZATION NOTE (inlinePreview.hide.label): Context menu item
+# for hiding the inline preview block
+inlinePreview.hide.label=Hide inline preview
+
 # LOCALIZATION NOTE (framework.disableGrouping): This is the text that appears in the
 # context menu to disable framework grouping.
 framework.disableGrouping=Disable Framework Grouping
@@ -909,70 +931,6 @@
 # the global scope.
 globalScopeLabel=Global
 
-# LOCALIZATION NOTE (variablesViewErrorStacktrace): This is the text that is
-# shown before the stack trace in an error.
-variablesViewErrorStacktrace=Stack trace:
-
-# LOCALIZATION NOTE (variablesViewMoreObjects): the text that is displayed
-# when you have an object preview that does not show all of the elements. At the end of the list
-# you see "N more..." in the web console output.
-# This is a semi-colon list of plural forms.
-# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
-# #1 number of remaining items in the object
-# example: 3 more…
-variablesViewMoreObjects=#1 more…;#1 more…
-
-# LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
-# in the variables list on an item with an editable name.
-variablesEditableNameTooltip=Double click to edit
-
-# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
-# in the variables list on an item with an editable value.
-variablesEditableValueTooltip=Click to change value
-
-# LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed
-# in the variables list on an item which can be removed.
-variablesCloseButtonTooltip=Click to remove
-
-# LOCALIZATION NOTE (variablesEditButtonTooltip): The text that is displayed
-# in the variables list on a getter or setter which can be edited.
-variablesEditButtonTooltip=Click to set value
-
-# LOCALIZATION NOTE (variablesDomNodeValueTooltip): The text that is displayed
-# in a tooltip on the "open in inspector" button in the the variables list for a
-# DOMNode item.
-variablesDomNodeValueTooltip=Click to select the node in the inspector
-
-# LOCALIZATION NOTE (configurable|...|Tooltip): The text that is displayed
-# in the variables list on certain variables or properties as tooltips.
-# Explanations of what these represent can be found at the following links:
-# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
-# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isExtensible
-# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isFrozen
-# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isSealed
-# It's probably best to keep these in English.
-configurableTooltip=configurable
-enumerableTooltip=enumerable
-writableTooltip=writable
-frozenTooltip=frozen
-sealedTooltip=sealed
-extensibleTooltip=extensible
-overriddenTooltip=overridden
-WebIDLTooltip=WebIDL
-
-# LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
-# in the variables list as a separator between the name and value.
-variablesSeparatorLabel=:
-
-# LOCALIZATION NOTE (watchExpressionsSeparatorLabel2): The text that is displayed
-# in the watch expressions list as a separator between the code and evaluation.
-watchExpressionsSeparatorLabel2=\u0020→
-
-# LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed
-# in the functions search panel as a separator between function's inferred name
-# and its real name (if available).
-functionSearchSeparatorLabel=←
-
 # LOCALIZATION NOTE(gotoLineModal.placeholder): The placeholder
 # text displayed when the user searches for specific lines in a file
 gotoLineModal.placeholder=Go to line…
@@ -1032,12 +990,6 @@
 # resumed first.
 resumptionOrderPanelTitle=There are one or more paused debuggers. Please resume the most-recently paused debugger first at: %S
 
-variablesViewOptimizedOut=(optimized away)
-variablesViewUninitialized=(uninitialized)
-variablesViewMissingArgs=(unavailable)
-
-anonymousSourcesLabel=Anonymous Sources
-
 experimental=This is an experimental feature
 
 # LOCALIZATION NOTE (whyPaused.debuggerStatement): The text that is displayed
@@ -1063,6 +1015,16 @@
 # DOM mutation breakpoint
 whyPaused.mutationBreakpoint=Paused on DOM mutation
 
+# LOCALIZATION NOTE (whyPaused.interrupted): The text that is displayed
+# in a info block explaining how the debugger is currently paused at
+# a JS execution
+whyPaused.interrupted=Paused at Execution
+
+# LOCALIZATION NOTE (whyPaused.replayForcedPause): The text that is displayed
+# in a info block explaining how the debugger is currently paused in a
+# recording.
+whyPaused.replayForcedPause=Paused in Recording
+
 # LOCALIZATION NOTE (whyPaused.resumeLimit): The text that is displayed
 # in a info block explaining how the debugger is currently paused while stepping
 # in or out of the stack
@@ -1179,3 +1141,74 @@
 # LOCALIZATION NOTE (shortcuts.buttonName): text describing
 # keyboard shortcut button text
 shortcuts.buttonName=Keyboard shortcuts
+
+# LOCALIZATION NOTE (variablesSeparatorLabel): The text that is displayed
+# in the variables list as a separator between the name and value.
+variablesSeparatorLabel=:
+
+# LOCALIZATION NOTE (watchExpressionsSeparatorLabel2): The text that is displayed
+# in the watch expressions list as a separator between the code and evaluation.
+watchExpressionsSeparatorLabel2=\u0020→
+
+# LOCALIZATION NOTE (functionSearchSeparatorLabel): The text that is displayed
+# in the functions search panel as a separator between function's inferred name
+# and its real name (if available).
+functionSearchSeparatorLabel=←
+
+variablesViewOptimizedOut=(optimized away)
+variablesViewUninitialized=(uninitialized)
+variablesViewMissingArgs=(unavailable)
+
+anonymousSourcesLabel=Anonymous Sources
+
+# LOCALIZATION NOTE (variablesDomNodeValueTooltip): The text that is displayed
+# in a tooltip on the "open in inspector" button in the the variables list for a
+# DOMNode item.
+variablesDomNodeValueTooltip=Click to select the node in the inspector
+
+# LOCALIZATION NOTE (variablesEditButtonTooltip): The text that is displayed
+# in the variables list on a getter or setter which can be edited.
+variablesEditButtonTooltip=Click to set value
+
+# LOCALIZATION NOTE (variablesViewErrorStacktrace): This is the text that is
+# shown before the stack trace in an error.
+variablesViewErrorStacktrace=Stack trace:
+
+# LOCALIZATION NOTE (variablesViewMoreObjects): the text that is displayed
+# when you have an object preview that does not show all of the elements. At the end of the list
+# you see "N more..." in the web console output.
+# This is a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of remaining items in the object
+# example: 3 more…
+variablesViewMoreObjects=#1 more…;#1 more…
+
+# LOCALIZATION NOTE (variablesEditableNameTooltip): The text that is displayed
+# in the variables list on an item with an editable name.
+variablesEditableNameTooltip=Double click to edit
+
+# LOCALIZATION NOTE (variablesEditableValueTooltip): The text that is displayed
+# in the variables list on an item with an editable value.
+variablesEditableValueTooltip=Click to change value
+
+# LOCALIZATION NOTE (variablesCloseButtonTooltip): The text that is displayed
+# in the variables list on an item which can be removed.
+variablesCloseButtonTooltip=Click to remove
+
+# LOCALIZATION NOTE (configurable|...|Tooltip): The text that is displayed
+# in the variables list on certain variables or properties as tooltips.
+# Explanations of what these represent can be found at the following links:
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/defineProperty
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isExtensible
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isFrozen
+# https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object/isSealed
+# It's probably best to keep these in English.
+configurableTooltip=configurable
+enumerableTooltip=enumerable
+writableTooltip=writable
+frozenTooltip=frozen
+sealedTooltip=sealed
+extensibleTooltip=extensible
+overriddenTooltip=overridden
+WebIDLTooltip=WebIDL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/netmonitor.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/netmonitor.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/netmonitor.properties	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/netmonitor.properties	2019-09-15 11:38:54.000000000 +0000
@@ -734,6 +734,14 @@
 # for the "Received" menu item displayed in the context menu in the websocket toolbar.
 netmonitor.ws.context.received.accesskey=R
 
+# LOCALIZATION NOTE (netmonitor.ws.context.copyFrame): This is the label displayed
+# on the context menu that shows "Copy Message".
+netmonitor.ws.context.copyFrame=Copy Message
+
+# LOCALIZATION NOTE (netmonitor.ws.context.copyFrame.accesskey): This is the access key
+# for the "Copy Message" menu item displayed in the context menu of a WebSocket frame.
+netmonitor.ws.context.copyFrame.accesskey=C
+
 # LOCALIZATION NOTE (netmonitor.ws.type.sent): This is the label used as
 # accessible text for the "sent" type icon in the websocket table's "data" column.
 netmonitor.ws.type.sent=Sent
@@ -763,6 +771,10 @@
 # displayed in the search toolbar to clear the search panel.
 netmonitor.search.toolbar.clear=Clear Search Results
 
+# LOCALIZATION NOTE (netmonitor.search.toolbar.caseSensitive): This is the label
+# displayed in the search toolbar to do a case sensitive search.
+netmonitor.search.toolbar.caseSensitive=Case Sensitive
+
 # LOCALIZATION NOTE (netmonitor.search.labels.responseHeaders): This is the label
 # displayed in the search results as the label for the response headers
 netmonitor.search.labels.responseHeaders=Response Header
@@ -770,6 +782,37 @@
 # LOCALIZATION NOTE (netmonitor.search.labels.requestHeaders): This is the label
 # displayed in the search results as the label for the request headers
 netmonitor.search.labels.requestHeaders=Request Header
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.fetching): This is the label
+# displayed in the search results status bar when status is set to fetching.
+netmonitor.search.status.labels.fetching=Searching…
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.canceled): This is the label
+# displayed in the search results status bar when status is set to cancelled.
+netmonitor.search.status.labels.canceled=Search canceled.
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.done): This is the label
+# displayed in the search results status bar when status is set to done.
+# %1$S is the number of matching lines in search results (netmonitor.search.status.labels.matchingLines)
+# %2$S is the number of files in which matching lines were found (netmonitor.search.status.labels.fileCount)
+netmonitor.search.status.labels.done=Search finished. %1$S %2$S.
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.matchingLines): Semi-colon list of plural forms.
+# This is the label displayed in the search results status bar showing matching lines found.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of matching lines found
+netmonitor.search.status.labels.matchingLines=Found #1 matching line;Found #1 matching lines
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.fileCount): Semi-colon list of plural forms.
+# This is the label displayed in the search results status bar showing file count
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of files in which matching lines were found
+netmonitor.search.status.labels.fileCount=in #1 file;in #1 files
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.error): This is the label
+# displayed in the search results status bar when status is set to error.
+netmonitor.search.status.labels.error=Search error.
+
 # LOCALIZATION NOTE (messagesTruncated): This is the text displayed
 # in the messages panel when the number of messages is over the
 # truncation limit.
@@ -880,6 +923,10 @@
 # shortcut key to focus on the toolbar url filtering textbox
 netmonitor.toolbar.filterFreetext.key=CmdOrCtrl+F
 
+# LOCALIZATION NOTE (netmonitor.toolbar.search.key): This is the
+# shortcut key to toggle the search panel
+netmonitor.toolbar.search.key=CmdOrCtrl+Shift+F
+
 # LOCALIZATION NOTE (netmonitor.toolbar.filterFreetext.learnMore): This is
 # the title used for MDN icon in filtering textbox
 netmonitor.toolbar.filterFreetext.learnMore=Learn more about filtering
@@ -1144,6 +1191,15 @@
 # for the Copy as cURL menu item displayed in the context menu for a request
 netmonitor.context.copyAsCurl.accesskey=C
 
+# LOCALIZATION NOTE (netmonitor.context.copyAsCurl.*): This is the template used to add
+# a target platform to the label for "Copy as cURL" command
+# e.g. Copy as cURL (Windows)
+# Localized label for "Copy as cURL": %S
+netmonitor.context.copyAsCurl.win=%S (Windows)
+netmonitor.context.copyAsCurl.win.accesskey=C
+netmonitor.context.copyAsCurl.posix=%S (POSIX)
+netmonitor.context.copyAsCurl.posix.accesskey=P
+
 # LOCALIZATION NOTE (netmonitor.context.copyAsFetch): This is the label displayed
 # on the context menu that copies the selected request as a fetch request.
 netmonitor.context.copyAsFetch=Copy as Fetch
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/scratchpad.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/scratchpad.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/scratchpad.properties	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/scratchpad.properties	2019-09-15 11:38:54.000000000 +0000
@@ -64,12 +64,12 @@
 # you try to revert unsaved content of scratchpad.
 confirmRevert.title=Revert Changes
 
-# LOCALIZATION NOTE  (scratchpadIntro): This is a multi-line comment explaining
+# LOCALIZATION NOTE  (scratchpadIntro1): This is a multi-line comment explaining
 # how to use the Scratchpad. Note that this should be a valid JavaScript
 # comment inside /* and */.
 scratchpadIntro1=/*\n * This is a JavaScript Scratchpad.\n *\n * Enter some JavaScript, then Right Click or choose from the Execute Menu:\n * 1. Run to evaluate the selected text (%1$S),\n * 2. Inspect to bring up an Object Inspector on the result (%2$S), or,\n * 3. Display to insert the result in a comment after the selection. (%3$S)\n */\n\n
 
-# LOCALIZATION NOTE  (notification.browserContext): This is the message displayed
+# LOCALIZATION NOTE  (browserContext.notification): This is the message displayed
 # over the top of the editor when the user has switched to browser context.
 browserContext.notification=This scratchpad executes in the Browser context.
 
@@ -82,7 +82,7 @@
 # Scratchpad.
 scratchpad.statusBarLineCol  = Line %1$S, Col %2$S
 
-# LOCALIZATION NOTE (fileExists.notification): This is the message displayed
+# LOCALIZATION NOTE (fileNoLongerExists.notification): This is the message displayed
 # over the top of the the editor when a file does not exist.
 fileNoLongerExists.notification=This file no longer exists.
 
@@ -99,7 +99,12 @@
 # %1 is the text of selfxss.okstring
 selfxss.msg=Scam Warning: Take care when pasting things you don't understand. This could allow attackers to steal your identity or take control of your computer. Please type '%S' in the scratchpad below to allow pasting.
 
-# LOCALIZATION NOTE (selfxss.msg): the string to be typed
+# LOCALIZATION NOTE (selfxss.okstring): the string to be typed
 # in by a new user of the developer tools when they receive the sefxss.msg prompt.
 # Please avoid using non-keyboard characters here
 selfxss.okstring=allow pasting
+
+# LOCALIZATION NOTE (scratchpad.deprecated.label): Text for the deprecation message
+# displayed when starting Scratchpad. 
+# This entire text is treated as a link to an MDN page.
+scratchpad.deprecated.label=Scratchpad will be disabled in a future release. Learn more…
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/startup.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/startup.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/startup.properties	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/startup.properties	2019-09-15 11:38:54.000000000 +0000
@@ -70,17 +70,16 @@
 # This is used as the label for the toolbox panel.
 ToolboxDebugger.panelLabel=Debugger Panel
 
-# LOCALIZATION NOTE (ToolboxDebugger.tooltip2):
-# This string is displayed in the tooltip of the tab when the debugger is
-# displayed inside the developer tools window..
-# A keyboard shortcut for JS Debugger will be shown inside brackets.
-ToolboxDebugger.tooltip2=JavaScript Debugger (%S)
-
 # LOCALIZATION NOTE (ToolboxDebugger.tooltip3):
 # This string is displayed in the tooltip of the tab when the debugger is
 # displayed inside the developer tools window.
 ToolboxDebugger.tooltip3=JavaScript Debugger
 
+# LOCALIZATION NOTE (ToolboxDebugger.tooltip4):
+# This string is displayed in the tooltip of the tab when the debugger is
+# displayed inside the developer tools window.
+ToolboxDebugger.tooltip4=JavaScript Debugger (%S)
+
 # LOCALIZATION NOTE (debuggerMenu.accesskey)
 # Used for the menuitem in the tool menu
 debuggerMenu.accesskey=D
@@ -104,48 +103,6 @@
 # editor.
 open.accesskey=l
 
-# LOCALIZATION NOTE (ToolboxShaderEditor.label):
-# This string is displayed in the title of the tab when the Shader Editor is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxShaderEditor.label=Shader Editor
-
-# LOCALIZATION NOTE (ToolboxShaderEditor.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxShaderEditor.panelLabel=Shader Editor Panel
-
-# LOCALIZATION NOTE (ToolboxShaderEditor.tooltip):
-# This string is displayed in the tooltip of the tab when the Shader Editor is
-# displayed inside the developer tools window.
-ToolboxShaderEditor.tooltip=Live GLSL shader language editor for WebGL
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.label):
-# This string is displayed in the title of the tab when the Shader Editor is
-# displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxCanvasDebugger.label=Canvas
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxCanvasDebugger.panelLabel=Canvas Panel
-
-# LOCALIZATION NOTE (ToolboxCanvasDebugger.tooltip):
-# This string is displayed in the tooltip of the tab when the Shader Editor is
-# displayed inside the developer tools window.
-ToolboxCanvasDebugger.tooltip=Tools to inspect and debug <canvas> contexts
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.label):
-# This string is displayed in the title of the tab when the Web Audio Editor
-# is displayed inside the developer tools window and in the Developer Tools Menu.
-ToolboxWebAudioEditor1.label=Web Audio
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.panelLabel):
-# This is used as the label for the toolbox panel.
-ToolboxWebAudioEditor1.panelLabel=Web Audio Panel
-
-# LOCALIZATION NOTE (ToolboxWebAudioEditor1.tooltip):
-# This string is displayed in the tooltip of the tab when the Web Audio Editor is
-# displayed inside the developer tools window.
-ToolboxWebAudioEditor1.tooltip=Web Audio context visualizer and audio node inspector
-
 # LOCALIZATION NOTE (inspector.*)
 # Used for the menuitem in the tool menu
 inspector.label=Inspector
@@ -267,12 +224,6 @@
 # Used for the menuitem in the tool menu
 accessibility.accesskey=y
 
-# LOCALIZATION NOTE (accessibility.tooltip2):
-# This string is displayed in the tooltip of the tab when the Accessibility is
-# displayed inside the developer tools window.
-# Keyboard shortcut for Accessibility panel will be shown inside the brackets.
-accessibility.tooltip2=Accessibility
-
 # LOCALIZATION NOTE (accessibility.tooltip3):
 # This string is displayed in the tooltip of the tab when the Accessibility is
 # displayed inside the developer tools window.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/storage.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/storage.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/storage.properties	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/storage.properties	2019-09-15 11:38:54.000000000 +0000
@@ -32,6 +32,8 @@
 tree.labels.indexedDB=Indexed DB
 tree.labels.Cache=Cache Storage
 
+tree.labels.extensionStorage=Extension Storage
+
 # LOCALIZATION NOTE (table.headers.*.*):
 # These strings are the header names of the columns in the Storage Table for
 # each type of storage available through the Storage Tree to the side.
@@ -69,6 +71,10 @@
 table.headers.indexedDB.autoIncrement=Auto Increment
 table.headers.indexedDB.indexes=Indexes
 
+table.headers.extensionStorage.area=Storage Area
+table.headers.extensionStorage.name=Key
+table.headers.extensionStorage.value=Value
+
 # LOCALIZATION NOTE (label.expires.session):
 # This string is displayed in the expires column when the cookie is Session
 # Cookie
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/toolbox.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/toolbox.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/toolbox.properties	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/toolbox.properties	2019-09-15 11:38:54.000000000 +0000
@@ -32,10 +32,6 @@
 # Needs to match scratchpad.keycode from browser.dtd
 scratchpad.keycode=VK_F4
 
-# LOCALIZATION NOTE (pickButton.tooltip)
-# This is the tooltip of the pick button in the toolbox toolbar
-pickButton.tooltip=Pick an element from the page
-
 # LOCALIZATION NOTE (toolbox.pickButton.tooltip)
 # This is the tooltip of the element picker button in the toolbox toolbar.
 # %S is the keyboard shortcut that toggles the element picker.
@@ -289,6 +285,22 @@
 # shown in the web replay timeline marker
 toolbox.replay.jumpMessage=Jump to message %1$S
 
+# LOCALIZATION NOTE (toolbox.replay.jumpMessage2): This is the label
+# shown in the web replay timeline marker
+toolbox.replay.jumpMessage2=Jump to %1$S
+
+# LOCALIZATION NOTE (toolbox.replay.resume): This is the text that appears in the
+# Replay command bar to prompt the user to resume the program.
+toolbox.replay.resume=Resume
+
+# LOCALIZATION NOTE (toolbox.replay.rewind): This is the text that appears in the
+# Replay command bar to prompt the user to rewind the program.
+toolbox.replay.rewind=Rewind
+
+# LOCALIZATION NOTE (toolbox.replay.pause): This is the text that appears in the
+# Replay command bar to prompt the user to pause the program.
+toolbox.replay.pause=Pause
+
 # LOCALIZATION NOTE (toolbox.debugTargetErrorPage.title): This is the title
 # for the Error view shown by the toolbox when a connection to a debug target
 # could not be made
@@ -298,3 +310,8 @@
 # text that appears in the Error view and explains to the user that an error
 # has happened while trying to connect to a debug target
 toolbox.debugTargetErrorPage.description = Cannot connect to the debug target. See error details below:
+
+# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the
+# settings panel for panel that will be removed in future releases.
+# This entire text is treated as a link to an MDN page.
+options.deprecationNotice=Deprecated. Learn More…
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/webconsole.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/webconsole.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/client/webconsole.properties	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/client/webconsole.properties	2019-09-15 11:38:54.000000000 +0000
@@ -284,6 +284,11 @@
 # when there are CSS errors in the page.
 webconsole.cssFilterButton.label=CSS
 
+# LOCALIZATION NOTE (webconsole.cssFilterButton.inactive.tooltip)
+# Label used as the tooltip of the "CSS" button in the additional filter toolbar, when the
+# filter is inactive (=unchecked).
+webconsole.cssFilterButton.inactive.tooltip=Stylesheets will be reparsed to check for errors. Refresh the page to also see errors from stylesheets modified from Javascript.
+
 # LOCALIZATION NOTE (webconsole.xhrFilterButton.label)
 # Label used as the text of the "XHR" button in the additional filter toolbar.
 # It shows or hides messages displayed when the page makes an XMLHttpRequest or
@@ -451,14 +456,39 @@
 # which is displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
 webconsole.editor.toolbar.history.nextExpressionButton.tooltip=Next Expression
 
-# LOCALIZATION NOTE (webconsole.editor.toolbar.closeButton.tooltip)
+# LOCALIZATION NOTE (webconsole.editor.toolbar.closeButton.tooltip2)
 # Label used for the tooltip on the close button, in the editor toolbar, which is
 # displayed when the editor mode is enabled (devtools.webconsole.input.editor=true).
 # Parameters: %S is the keyboard shortcut.
-webconsole.editor.toolbar.closeButton.tooltip=Close Editor (%S)
+webconsole.editor.toolbar.closeButton.tooltip2=Switch back to inline mode (%S)
 
-# LOCALIZATION NOTE (webconsole.input.openEditorButton.tooltip)
+# LOCALIZATION NOTE (webconsole.input.openEditorButton.tooltip2)
 # Label used for the tooltip on the open editor button, in console input, which is
 # displayed when the console is in regular mode.
 # Parameters: %S is the keyboard shortcut.
-webconsole.input.openEditorButton.tooltip=Open Editor (%S)
+webconsole.input.openEditorButton.tooltip2=Switch to multi-line editor mode (%S)
+
+# LOCALIZATION NOTE (webconsole.warningGroup.messageCount.tooltip): the tooltip text
+# displayed when you hover a warning group badge (i.e. repeated warning messages for a
+# given category, for example Content Blocked messages) in the web console output.
+# This is a semi-colon list of plural forms.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 number of message in the group.
+# example: 3 messages
+webconsole.warningGroup.messageCount.tooltip=#1 message;#1 messages
+
+# LOCALIZATION NOTE (webconsole.input.editor.onboarding.label): the text that is displayed
+# when displaying the multiline-input mode for the first time, until the user dismiss the
+# text.
+# Parameters: %1$S is Enter key, %2$S is the shorcut to evaluate the expression (
+# Ctrl+Enter or Cmd+Enter on OSX).
+webconsole.input.editor.onboarding.label=Iterate on your code faster with the new multi-line editor mode. Use %1$S to add new lines and %2$S to run.
+
+# LOCALIZATION NOTE (webconsole.input.editor.onboarding.dissmis.label): the text that is
+# displayed in the multiline-input mode onboarding UI to dismiss it.
+webconsole.input.editor.onboarding.dissmis.label=Got it!
+
+# LOCALIZATION NOTE (webconsole.enterKey): The text that will be used to represent the
+# Enter key in the editor onboarding UI, as well as on the Editor toolbar "Run" button
+# tooltip.
+webconsole.enterKey=Enter
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/shared/accessibility.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/shared/accessibility.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/shared/accessibility.properties	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/shared/accessibility.properties	2019-09-15 11:38:54.000000000 +0000
@@ -119,3 +119,34 @@
 # describes that currently selected accessible object for a toolbar must have a
 # name provided when there is more than one toolbar in the document.
 accessibility.text.label.issue.toolbar = Toolbars must be labeled when there is more than one toolbar.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.semantics): A title text that
+# describes that currently selected accessible object is focusable and should
+# indicate that it could be interacted with.
+accessibility.keyboard.issue.semantics=Focusable elements should have interactive semantics.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.tabindex): A title text that
+# describes that currently selected accessible object has a corresponding
+# DOMNode that defines a tabindex attribute greater that 0 which can result in
+# unexpected behaviour when navigating with keyboard.
+accessibility.keyboard.issue.tabindex=Avoid using “tabindex” attribute greater than zero.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.action): A title text that
+# describes that currently selected accessible object is interactive but can not
+# be activated using keyboard or accessibility API.
+accessibility.keyboard.issue.action=Interactive elements must be able to be activated using a keyboard.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.focusable): A title text that
+# describes that currently selected accessible object is interactive but is not
+# focusable with a keyboard.
+accessibility.keyboard.issue.focusable=Interactive elements must be focusable.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.focus.visible): A title text
+# that describes that currently selected accessible object is focusable but
+# might not have appropriate focus styling.
+accessibility.keyboard.issue.focus.visible=Focusable element may be missing focus styling.
+
+# LOCALIZATION NOTE (accessibility.keyboard.issue.mouse.only): A title text that
+# describes that currently selected accessible object is not focusable and not
+# semantic but can be activated via mouse (e.g. has click handler).
+accessibility.keyboard.issue.mouse.only=Clickable elements must be focusable and should have interactive semantics.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/startup/key-shortcuts.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/startup/key-shortcuts.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/rm/devtools/startup/key-shortcuts.properties	2019-09-13 05:18:08.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/rm/devtools/startup/key-shortcuts.properties	2019-09-15 11:38:54.000000000 +0000
@@ -38,6 +38,10 @@
 # Key pressed to open a toolbox with the web console panel selected
 webconsole.commandkey=K
 
+# LOCALIZATION NOTE (jsdebugger.commandkey):
+# Key pressed to open a toolbox with the debugger panel selected
+jsdebugger.commandkey=L
+
 # LOCALIZATION NOTE (netmonitor.commandkey):
 # Key pressed to open a toolbox with the network monitor panel selected
 netmonitor.commandkey=E
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/browser/browser/newtab/asrouter.ftl	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/browser/browser/newtab/asrouter.ftl	2019-09-15 11:39:00.000000000 +0000
@@ -84,11 +84,11 @@
     .label = Ce este nou
     .tooltiptext = Ce este nou
 cfr-whatsnew-panel-header = Ce este nou
-cfr-whatsnew-release-notes-link-text = Citește notele de lansare
+cfr-whatsnew-release-notes-link-text = Citește notele privind versiunea
 cfr-whatsnew-fx70-title = { -brand-short-name } acum luptă și mai mult pentru intimitatea ta
 cfr-whatsnew-fx70-body = Ultima actualizare sporește funcția de Protecție împotriva urmării și face mai ușoară ca niciodată crearea de parole securizate pentru fiecare site.
 cfr-whatsnew-tracking-protect-title = Protejează-te împotriva elementelor de urmărire
-cfr-whatsnew-tracking-protect-body = { -brand-short-name } blochează multe elemente frecvente de urmărire pe site-urile de socializare și de urmărire încrucișată care îți urmăresc acțiunile online.
+cfr-whatsnew-tracking-protect-body = { -brand-short-name } blochează multe elemente frecvente de urmărire ale rețelelor socializare și între site-uri care îți urmăresc acțiunile online.
 cfr-whatsnew-tracking-protect-link-text = Vezi raportul
 # This string is displayed before a large numeral that indicates the total
 # number of tracking elements blocked. Don’t add $blockedCount to your
@@ -99,13 +99,13 @@
         [few] elemente de urmărire blocate
        *[other] de elemente de urmărire blocate
     }
-cfr-whatsnew-tracking-blocked-subtitle = De la { DATETIME($earliestDate, month: "long", year: "numeric") }
+cfr-whatsnew-tracking-blocked-subtitle = Din { DATETIME($earliestDate, month: "long", year: "numeric") }
 cfr-whatsnew-tracking-blocked-link-text = Vezi raportul
 cfr-whatsnew-lockwise-backup-title = Creează o copie de siguranță cu parolele
 cfr-whatsnew-lockwise-backup-body = Acum generează parole securizate pe care le poți accesa de oriunde te conectezi.
 cfr-whatsnew-lockwise-backup-link-text = Activează crearea de copii de siguranță
 cfr-whatsnew-lockwise-take-title = Ia-ți parolele cu tine
-cfr-whatsnew-lockwise-take-body = Aplicația pentru dispozitive mobile { -lockwise-brand-short-name } îți permite să îți accesezi în siguranță parolele din copia de siguranță oriunde te-ai afla.
+cfr-whatsnew-lockwise-take-body = Aplicația pentru dispozitive mobile { -lockwise-brand-short-name } îți permite să îți accesezi în siguranță parolele cărora le-ai făcut backup, oriunde te-ai afla.
 cfr-whatsnew-lockwise-take-link-text = Obține aplicația
 
 ## Bookmark Sync
@@ -136,3 +136,10 @@
 cfr-doorhanger-firefox-send-body = Păstrează-ți documentele sensibile în siguranță și protejate de ochii indiscreți cu o criptare end-to-end și un link ce dispare când ai terminat.
 cfr-doorhanger-firefox-send-ok-button = Încearcă { -send-brand-name }
     .accesskey = T
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Vezi protecțiile
+    .accesskey = P
+cfr-doorhanger-socialtracking-close-button = Închide
+    .accesskey = C
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/browser/browser/preferences/preferences.ftl	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/browser/browser/preferences/preferences.ftl	2019-09-15 11:39:00.000000000 +0000
@@ -342,6 +342,9 @@
 browsing-search-on-start-typing =
     .label = Caută textul când încep să tastez
     .accesskey = x
+browsing-picture-in-picture-toggle-enabled =
+    .label = Activează comenzile video picture-in-picture
+    .accesskey = E
 browsing-picture-in-picture-learn-more = Află mai multe
 browsing-cfr-recommendations =
     .label = Recomandă extensii pe măsură ce navighezi
@@ -691,7 +694,7 @@
 sitedata-option-block-cross-site-trackers =
     .label = Elemente de urmărire între site-uri
 sitedata-option-block-cross-site-and-social-media-trackers =
-    .label = Elemente de urmărire ale rețelelor sociale și cel între site-uri
+    .label = Elemente de urmărire ale rețelelor sociale și între site-uri
 sitedata-option-block-unvisited =
     .label = Cookie-uri de pe site-uri web nevizitate
 sitedata-option-block-all-third-party =
@@ -746,6 +749,13 @@
 content-blocking-custom-desc = Alege ce să blochezi.
 content-blocking-private-trackers = Elemente de urmărire cunoscute numai în ferestre private
 content-blocking-third-party-cookies = Cookie-uri de urmărire de la terți
+
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
+
+
+
 content-blocking-etp-standard-desc = Echilibrat pentru protecție și performanță. Paginile se vor încărca normal.
 content-blocking-etp-strict-desc = O protecție mai puternică, dar poate provoca funcționarea necorespunzătoare a site-urilor sau a conținutului.
 content-blocking-etp-custom-desc = Alege ce elemente de urmărire și scripturi să blochezi.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/browser/browser/protections.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/browser/browser/protections.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/browser/browser/protections.ftl	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/browser/browser/protections.ftl	2019-09-15 11:39:00.000000000 +0000
@@ -16,9 +16,9 @@
 # earliest date recorded in the database.
 graph-total-tracker-summary =
     { $count ->
-        [one] <b>{ $count }</b>element de urmărire blocat de la { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
-        [few] <b>{ $count }</b>elemente de urmărire blocate de la { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
-       *[other] <b>{ $count }</b>de elemente de urmărire blocate de la { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
+        [one] <b>{ $count }</b> element de urmărire blocat de la { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
+        [few] <b>{ $count }</b> elemente de urmărire blocate de la { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
+       *[other] <b>{ $count }</b> de elemente de urmărire blocate de la { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }
     }
 # The terminology used to refer to categories of Content Blocking is also used in chrome/browser/browser.properties and should be translated consistently.
 # "Standard" in this case is an adjective, meaning "default" or "normal".
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/browser/chrome/browser/browser.dtd	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/browser/chrome/browser/browser.dtd	2019-09-15 11:39:00.000000000 +0000
@@ -76,12 +76,19 @@
 <!ENTITY menubarCmd.label "Bară de meniu">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "Bară de navigare">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
 <!ENTITY personalbarCmd.label "Bară de marcaje">
 <!ENTITY personalbarCmd.accesskey "B">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
 <!ENTITY bookmarksToolbarItem.label "Elemente pe bara de marcaje">
 
 <!ENTITY pageSourceCmd.label "Sursa paginii">
 <!ENTITY pageSourceCmd.accesskey "o">
+
 <!ENTITY pageSourceCmd.commandkey "u">
 <!-- LOCALIZATION NOTE (pageSourceCmd.SafariCommandKey should match the
 Option+Command keyboard shortcut letter that Safari and Chrome use for "View
@@ -92,6 +99,7 @@
 
 <!ENTITY pageInfoCmd.label "Informații privind pagina">
 <!ENTITY pageInfoCmd.accesskey "I">
+
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY ldbCmd.label "Depanator de așezare în pagină">
 <!ENTITY ldbCmd.accesskey "L">
@@ -117,6 +125,8 @@
 <!ENTITY fxaUnverified.label "Verifică-ți contul">
 
 
+ <!-- } is above this key on many keyboards -->
+
 <!ENTITY fullScreenMinimize.tooltip "Minimizează">
 <!ENTITY fullScreenRestore.tooltip "Restaurează">
 <!ENTITY fullScreenClose.tooltip "Închide">
@@ -137,6 +147,7 @@
 <!ENTITY fxa.unverified.description.label "Va trebui să îți verifici contul înainte de a putea sincroniza.">
 <!ENTITY fxa.unverified.button.label "Deschide setările pentru &syncBrand.shortName.label;…">
 
+<!ENTITY pictureInPictureHideToggle.label "Ascunde comutatorul Picture-in-Picture">
 <!ENTITY pictureInPictureHideToggle.accesskey "H">
 
 <!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
@@ -144,6 +155,10 @@
      followed by the user's email. -->
 <!ENTITY fxa.menu.signedInAs.label "Autentificat ca">
 <!ENTITY fxa.menu.manageAccount.label "Gestionează contul…">
+
+<!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
+     for the Firefox Account toolbar menu screen. The `Signed in as` text is
+     followed by the user's email. -->
 <!ENTITY fxa.menu.syncSettings.label "Setări pentru &syncBrand.shortName.label;…">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Conectează alt dispozitiv…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
@@ -194,6 +209,7 @@
 
 <!ENTITY bookmarksMenu.label "Marcaje">
 <!ENTITY bookmarksMenu.accesskey "B">
+
 <!ENTITY bookmarkThisPageCmd.label "Marchează pagina">
 <!ENTITY editThisBookmarkCmd.label "Editează acest marcaj">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -508,6 +524,7 @@
      This is set as the aria-label attribute for the search input box in the
      in-content search UI, to be used by screen readers. -->
 <!ENTITY contentSearchInput.label     "Subiect de căutare">
+
 <!ENTITY contentSearchSubmit.tooltip  "Trimite căutarea">
 
 <!-- LOCALIZATION NOTE (searchInput.placeholder):
@@ -970,6 +987,7 @@
 <!ENTITY contentBlocking.cookies.label "Cookie-uri">
 <!ENTITY contentBlocking.cookiesView.label "Cookie-uri și date ale site-urilor">
 
+
 <!ENTITY contentBlocking.socialblock.label "Elemente de urmărire ale rețelelor sociale">
 
 <!ENTITY contentBlocking.cookies2.label "Cookie-uri de urmărire între site-uri">
@@ -984,6 +1002,7 @@
 <!ENTITY contentBlocking.breakageReportView.label "Raportează probleme">
 <!ENTITY contentBlocking.breakageReportView2.description "Blocarea de conținut poate produce probleme pe unele site-uri web. Prin raportarea problemelor vei ajuta la îmbunătățirea &brandShortName; pentru toți. (Va trimite la Mozilla un URL și informații despre setările browserului.)">
 <!ENTITY contentBlocking.breakageReportView.learnMore "Află mai multe">
+
 <!ENTITY contentBlocking.breakageReportView.title "Raportează un site nefuncțional">
 <!ENTITY contentBlocking.breakageReportView3.description "Blocarea anumitor elemente de urmărire poate produce probleme pe unele site-uri web. Raportarea acestor problemele ajută la îmbunătățirea &brandShortName; pentru toți. Trimițând la Mozilla acest raport vei trimite un URL și informații despre setările browserului.">
 <!ENTITY contentBlocking.breakageReportView2.learnMore "Află mai multe">
@@ -1039,6 +1058,7 @@
 <!ENTITY newTabControlled.disableButton.accesskey "D">
 
 <!ENTITY homepageControlled.message "O extensie a schimbat ce vezi ca pagină de start. Poți restaura setările dacă nu vrei această modificare.">
+
 <!ENTITY homepageControlled.header.message "Pagina ta de start s-a schimbat.">
 <!ENTITY homepageControlled.keepButton.label "Păstrează modificările">
 <!ENTITY homepageControlled.keepButton.accesskey "K">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/browser/chrome/browser/browser.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/browser/chrome/browser/browser.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/browser/chrome/browser/browser.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/browser/chrome/browser/browser.properties	2019-09-15 11:39:00.000000000 +0000
@@ -673,6 +673,7 @@
 contentBlocking.socialblock.secondaryButton.label=Închide
 contentBlocking.socialblock.secondaryButton.accessKey=C
 
+trackingProtection.icon.activeTooltip2=Se blochează elementele de urmărire ale rețelelor sociale, cookie-urile de urmărire între site-uri și detectoarele de amprente digitale.
 trackingProtection.icon.disabledTooltip2=Protecția îmbunătățită împotriva urmăririi este DEZACTIVATĂ pentru acest site.
 # LOCALIZATION NOTE (trackingProtection.icon.noTrackersDetectedTooltip): %S is brandShortName.
 trackingProtection.icon.noTrackersDetectedTooltip=Nu a fost depistat niciun element de urmărire cunoscut de %S.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/chat/xmpp.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/chat/xmpp.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/chat/xmpp.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/chat/xmpp.properties	2019-09-15 11:39:00.000000000 +0000
@@ -18,7 +18,7 @@
 # LOCALIZATION NOTE (connection.error.*)
 #   These will show in the account manager if an error occurs during the
 #   connection attempt.
-connection.error.invalidUsername=Nume de utilizator invalid (numele de utilizator trebuie să conțină un caracter „@”)
+connection.error.invalidUsername=Nume de utilizator nevalid (numele de utilizator trebuie să conțină un caracter „@”)
 connection.error.failedToCreateASocket=Nu s-a putut crea un socket (Ești offline?)
 connection.error.serverClosedConnection=Serverul a închis conexiunea
 connection.error.resetByPeer=Conexiune resetată de partener
@@ -110,7 +110,6 @@
 tooltip.organization=Organizație
 tooltip.locality=Localitate
 tooltip.country=Țară
-
 tooltip.telephone=Număr de telefon
 
 # LOCALIZATION NOTE (chatRoomField.*):
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/devtools/client/netmonitor.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/devtools/client/netmonitor.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/devtools/client/netmonitor.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/devtools/client/netmonitor.properties	2019-09-15 11:39:00.000000000 +0000
@@ -771,6 +771,9 @@
 # displayed in the search toolbar to clear the search panel.
 netmonitor.search.toolbar.clear=Șterge rezultatele căutării
 
+# LOCALIZATION NOTE (netmonitor.search.toolbar.caseSensitive): This is the label
+# displayed in the search toolbar to do a case sensitive search.
+
 # LOCALIZATION NOTE (netmonitor.search.labels.responseHeaders): This is the label
 # displayed in the search results as the label for the response headers
 netmonitor.search.labels.responseHeaders=Antetul răspunsului
@@ -778,6 +781,31 @@
 # LOCALIZATION NOTE (netmonitor.search.labels.requestHeaders): This is the label
 # displayed in the search results as the label for the request headers
 netmonitor.search.labels.requestHeaders=Antetul cererii
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.fetching): This is the label
+# displayed in the search results status bar when status is set to fetching.
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.canceled): This is the label
+# displayed in the search results status bar when status is set to cancelled.
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.done): This is the label
+# displayed in the search results status bar when status is set to done.
+# %1$S is the number of matching lines in search results (netmonitor.search.status.labels.matchingLines)
+# %2$S is the number of files in which matching lines were found (netmonitor.search.status.labels.fileCount)
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.matchingLines): Semi-colon list of plural forms.
+# This is the label displayed in the search results status bar showing matching lines found.
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of matching lines found
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.fileCount): Semi-colon list of plural forms.
+# This is the label displayed in the search results status bar showing file count
+# See: http://developer.mozilla.org/en/docs/Localization_and_Plurals
+# #1 is the number of files in which matching lines were found
+
+# LOCALIZATION NOTE (netmonitor.search.status.labels.error): This is the label
+# displayed in the search results status bar when status is set to error.
+
 # LOCALIZATION NOTE (messagesTruncated): This is the text displayed
 # in the messages panel when the number of messages is over the
 # truncation limit.
@@ -993,7 +1021,7 @@
 
 # LOCALIZATION NOTE (netmonitor.summary.size): This is the label displayed
 # in the network details headers tab identifying the headers size.
-netmonitor.summary.size=Mărimea anteturilor:
+netmonitor.summary.size=Dimensiunea anteturilor:
 
 # LOCALIZATION NOTE (netmonitor.response.name): This is the label displayed
 # in the network details response tab identifying an image's file name.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/devtools/startup/aboutDevTools.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/devtools/startup/aboutDevTools.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/devtools/startup/aboutDevTools.ftl	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/devtools/startup/aboutDevTools.ftl	2019-09-15 11:39:00.000000000 +0000
@@ -14,14 +14,14 @@
 enable-enable-button = Activează instrumentele de dezvoltare
 enable-close-button = Închide această filă
 welcome-title = Bine ai venit la instrumentele de dezvoltare Firefox!
-newsletter-title = Buletinul de știri Mozilla pentru dezvoltatori
+newsletter-title = Buletinul informativ Mozilla pentru dezvoltatori
 newsletter-message = Primește știri pentru dezvoltatori, trucuri și resurse direct în căsuța poștală.
 newsletter-email-placeholder =
     .placeholder = E-mail
 newsletter-privacy-label = Sunt de acord ca Mozilla să îmi gestioneze informațiile, conform explicațiilor din această <a data-l10n-name="privacy-policy">Politică de confidențialitate</a>.
 newsletter-subscribe-button = Abonează-te
 newsletter-thanks-title = Îți mulțumim!
-newsletter-thanks-message = Dacă nu ai confirmat anterior o abonare la un buletin de știri în legătură cu Mozilla, este posibil să fie nevoie să o faci. Te rugăm să verifici mesajele primite sau dosarul spam pentru mesaje de e-mail de la noi.
+newsletter-thanks-message = Dacă nu ai confirmat anterior o abonare la un buletin informativ în legătură cu Mozilla, este posibil să fie nevoie să o faci. Te rugăm să verifici mesajele primite sau dosarul spam pentru mesaje de e-mail de la noi.
 footer-title = Firefox Developer Edition
 footer-message = Cauți mai mult decât instrumente de dezvoltare? Aruncă o privire asupra browserului Firefox care este construit special pentru dezvoltatori și fluxuri de lucru moderne.
 footer-learn-more-link = Află mai multe
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/dom/chrome/dom/dom.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/dom/chrome/dom/dom.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/dom/chrome/dom/dom.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/dom/chrome/dom/dom.properties	2019-09-15 11:39:00.000000000 +0000
@@ -107,7 +107,7 @@
 # LOCALIZATION NOTE: Do not translate MediaStream and createMediaStreamSource.
 MediaStreamAudioSourceNodeCrossOrigin=MediaStream pasat la createMediaStreamSource are o origine cross-origin, nodul nu va emite nimic.
 # LOCALIZATION NOTE : Do not translate MediaStreamTrack and createMediaStreamTrackSource.
-MediaStreamTrackAudioSourceNodeCrossOrigin=MediaStreamTrack trecută în createMediaStreamTrackSource este o resursă cu origine încrucișată, nodul va genera tăcere.
+MediaStreamTrackAudioSourceNodeCrossOrigin=MediaStreamTrack pasat în createMediaStreamTrackSource este o resursă cu origine cross-origin, nodul nu va emite nimic.
 # LOCALIZATION NOTE: Do not translate HTMLMediaElement and MediaStream.
 MediaElementAudioCaptureOfMediaStreamError=HTMLMediaElement capturat redă un MediaStream. Aplicarea unui nivel de volum și dezactivarea sunetului nu sunt suportate momentan.
 MediaLoadExhaustedCandidates=Nu au putut fi încărcate toate resursele candidat. Încărcarea de media a fost întreruptă.
@@ -249,7 +249,7 @@
 # LOCALIZATION NOTE: %1$S is the name of the property whose value is invalid. %2$S is the (invalid) value of the property. E.g. "theme_color: 42 is not a valid CSS color."
 ManifestInvalidCSSColor=%1$S: %2$S nu este o culoare validă CSS.
 # LOCALIZATION NOTE: %1$S is the name of the property whose value is invalid. %2$S is the (invalid) value of the property. E.g. "lang: 42 is not a valid language code."
-ManifestLangIsInvalid=%1$S: %2$S nu este un cod valid de limbaj.
+ManifestLangIsInvalid=%1$S: %2$S nu este un cod valid de limbă.
 # LOCALIZATION NOTE: %1$S is the name of the parent property whose value is invalid (e.g., "icons"). %2$S is the index of the image object that is invalid (from 0). %3$S is the name of actual member that is invalid. %4$S is the invalid value. E.g. "icons item at index 2 is invalid. The src member is an invalid URL http://:Invalid"
 ManifestImageURLIsInvalid=Elementul %1$S de la indicele %2$S este nevalid. Membrul %3$S este un URL nevalid %4$S
 # LOCALIZATION NOTE: %1$S is the name of the parent property that that contains the unusable image object (e.g., "icons"). %2$S is the index of the image object that is unusable (from 0). E.g. "icons item at index 2 lacks a usable purpose. It will be ignored."
@@ -348,8 +348,8 @@
 ScriptSourceLoadFailed=Nu a reușit încărcarea elementului <script> cu sursa „%S”.
 ModuleSourceLoadFailed=Nu a reușit încărcarea modulului cu sursa „%S”.
 # LOCALIZATION NOTE: Do not translate "<script>".
-ScriptSourceMalformed=URI-ul sursei <script> este format greșit: „%S”.
-ModuleSourceMalformed=URI-ul sursei modulului este format greșit: „%S”.
+ScriptSourceMalformed=URI-ul sursei <script> este malformat: „%S”.
+ModuleSourceMalformed=URI-ul sursei modulului este malformat: „%S”.
 # LOCALIZATION NOTE: Do not translate "<script>".
 ScriptSourceNotAllowed=URI-ul sursei <script> nu este permis în acest document: „%S”.
 ModuleSourceNotAllowed=URI-ul sursei modulului nu este permis în acest document: „%S”.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/dom/chrome/layout/css.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/dom/chrome/layout/css.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/dom/chrome/layout/css.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/dom/chrome/layout/css.properties	2019-09-15 11:39:00.000000000 +0000
@@ -84,7 +84,7 @@
 PEPseudoSelMultiplePE=Pseudo-element în plus „%1$S”.
 PEPseudoSelUnknown=Pseudo-clasă sau pseudo element necunoscut „%1$S”.
 PENegationEOF=selector în cadrul negării
-PENegationBadInner=Selector simplu malformat ca argument pentru negația pseudo-clasei „%1$S”.
+PENegationBadInner=Selector simplu malformat, ca argument pentru negația pseudo-clasei „%1$S”.
 PENegationNoClose=„)” de închidere lipsă în negația pseudo-clasei „%1$S”.
 PENegationBadArg=Argument lipsă în negația pseudo-clasei „%1$S”.
 PEPseudoClassArgEOF=argument pentru selectorul pseudo-clasă
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/dom/chrome/layout/xbl.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/dom/chrome/layout/xbl.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/dom/chrome/layout/xbl.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/dom/chrome/layout/xbl.properties	2019-09-15 11:39:00.000000000 +0000
@@ -10,6 +10,6 @@
 CircularExtendsBinding=Extinderea cuplării XBL „%S” cu „%S” ar duce la extinderea sa proprie
 # LOCALIZATION NOTE: do not localize <handler command="…">
 CommandNotInChrome=Folosirea <handler command="…"> nu este permisă în afara chrome.
-MalformedXBL = Un fișier XBL este formatat greșit. Ați uitat spațiul de nume XBL din eticheta de legare?
-InvalidExtendsBinding=Nu se permite extinderea „%S”. În general, nu extinde numele etichetelor.
+MalformedXBL = Un fișier XBL este malformat. Ai uitat spațiul de nume XBL din eticheta de legare?
+InvalidExtendsBinding=Extinderea „%S” este nevalidă. În general, nu extinde numele etichetelor.
 MissingIdAttr = Lipsește un atribut „id” de la eticheta de legare.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/dom/chrome/security/security.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/dom/chrome/security/security.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/dom/chrome/security/security.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/dom/chrome/security/security.properties	2019-09-15 11:39:00.000000000 +0000
@@ -6,20 +6,20 @@
 # CORS
 # LOCALIZATION NOTE: Do not translate "Access-Control-Allow-Origin", Access-Control-Allow-Credentials, Access-Control-Allow-Methods, Access-Control-Allow-Headers
 CORSDisabled=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: CORS dezactivat).
-CORSDidNotSucceed=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: solicitare CORS nu a reușit).
-CORSOriginHeaderNotAdded=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: antetul CORS ‘Origini' nu s-a putut adăuga).
-CORSExternalRedirectNotAllowed=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la %1$S. (Motivul: solicitare CORS redirecționare externă nu este permis).
+CORSDidNotSucceed=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: solicitarea CORS a eșuat).
+CORSOriginHeaderNotAdded=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: antetul CORS ‘Origini' nu poate fi adăugat).
+CORSExternalRedirectNotAllowed=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la %1$S. (Motivul: redirecționarea externă a solicitării CORS nu este permisă).
 CORSRequestNotHttp=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: CORS nu solicită http).
-CORSMissingAllowOrigin=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: Antetul CORS „Access-Control-Allow-Origin” lipsește).
-CORSMultipleAllowOriginNotAllowed=Cererea cross-origin a fost blocată: Politica „Same Origin” nu permite citirea resursei de la distanță aflată la %1$S. (Motivul: Antet multiplu CORS „Access-Control-Allow-Origin” nu este permis).
-CORSAllowOriginNotMatchingOrigin=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: Antetul CORS „Access-Control-Allow-Origin” nu se potrivește cu „%2$S”).
-CORSNotSupportingCredentials=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: Datele de autentificare nu sunt suportate dacă antetul CORS „Access-Control-Allow-Origin” este „*”).
-CORSMethodNotFound=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: Nu a fost găsită metoda în antetul CORS „Access-Control-Allow-Method”).
-CORSMissingAllowCredentials=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: Se aștepta „true” în antetul CORS „Access-Control-Allow-Credentials”).
-CORSPreflightDidNotSucceed=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: canalul preflight al cererilor CORS a eșuat).
-CORSInvalidAllowMethod=Solicitare multiorigine blocată: Politica de corelare a originii nu permite citirea resursei la distanță de la „%1$S”. (Motiv: jeton invalid „%2$S” în antetul CORS „Access-Control-Allow-Methods”).
-CORSInvalidAllowHeader=Solicitare multiorigine blocată: Politica de corelare a originii nu permite citirea resursei la distanță de la „%1$S”. (Motiv: Jeton invalid „%2$S” în antetul CORS „Access-Control-Allow-Headers”).
-CORSMissingAllowHeaderFromPreflight=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: jeton lipsă „%2$S” în antetul CORS „Access-Control-Allow-Headers” din canalul preflight al cererilor CORS).
+CORSMissingAllowOrigin=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: antetul CORS „Access-Control-Allow-Origin” lipsește).
+CORSMultipleAllowOriginNotAllowed=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei de la distanță de la %1$S. (Motivul: antetul multiplu CORS „Access-Control-Allow-Origin” nu este permis).
+CORSAllowOriginNotMatchingOrigin=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: antetul CORS „Access-Control-Allow-Origin” nu se potrivește cu „%2$S”).
+CORSNotSupportingCredentials=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: datele de autentificare nu sunt suportate dacă antetul CORS „Access-Control-Allow-Origin” este „*”).
+CORSMethodNotFound=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: nu a fost găsită metoda în antetul CORS „Access-Control-Allow-Method”).
+CORSMissingAllowCredentials=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: se aștepta „true” în antetul CORS „Access-Control-Allow-Credentials”).
+CORSPreflightDidNotSucceed=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: canalul preflight al solicitărilor CORS a eșuat).
+CORSInvalidAllowMethod=Solicitarea Cross-Origin a fost blocată: Politica de corelare a originii nu permite citirea resursei la distanță de la „%1$S”. (Motiv: jeton nevalid „%2$S” în antetul CORS „Access-Control-Allow-Methods”).
+CORSInvalidAllowHeader=Solicitarea Cross-Origin a fost blocată: Politica de corelare a originii nu permite citirea resursei la distanță de la „%1$S”. (Motiv: jeton nevalid „%2$S” în antetul CORS „Access-Control-Allow-Headers”).
+CORSMissingAllowHeaderFromPreflight=Solicitarea Cross-Origin a fost blocată: Politica „Same Origin” nu permite citirea resursei la distanță de la „%1$S”. (Motivul: jeton lipsă „%2$S” în antetul CORS „Access-Control-Allow-Headers” din canalul preflight al solicitărilor CORS).
 
 # LOCALIZATION NOTE: Do not translate "Strict-Transport-Security", "HSTS", "max-age" or "includeSubDomains"
 STSUnknownError=Strict-Transport-Security: S-a produs o eroare necunoscută la procesarea antetului specificat de site.
@@ -61,7 +61,7 @@
 
 # Sub-Resource Integrity
 # LOCALIZATION NOTE: Do not translate "script" or "integrity". "%1$S" is the invalid token found in the attribute.
-MalformedIntegrityHash=Elementul script are un hash formatat greșit în atributul de integritate: „%1$S”. Formatul corect este „<hash algorithm>-<hash value>”.
+MalformedIntegrityHash=Elementul script are un hash malformat în atributul său de integritate: „%1$S”. Formatul corect este „<algoritmul hash>-<valoarea hash>”.
 # LOCALIZATION NOTE: Do not translate "integrity"
 InvalidIntegrityLength=Hash-ul conținut în atributul de integritate are lungimea greșită.
 # LOCALIZATION NOTE: Do not translate "integrity"
@@ -86,6 +86,8 @@
 # LOCALIZATION NOTE: Do not translate "X-Content-Type-Options" and also do not translate "nosniff".
 XCTOHeaderValueMissing=Atenție la antetul X-Content-Type-Options: valoarea a fost „%1$S”; ai vrut să trimiți „nosniff”?
 
+# LOCALIZATION NOTE: Do not translate "X-Content-Type-Options" and also do not translate "nosniff".
+
 BlockScriptWithWrongMimeType2=Scriptul din „%1$S” a fost blocat din cauza unui tip MIME nepermis („%2$S”).
 WarnScriptWithWrongMimeType=Scriptul din „%1$S” a fost încărcat chiar dacă tipul MIME („%2$S”) aferent nu este un tip valid de MIME JavaScript.
 # LOCALIZATION NOTE: Do not translate "importScripts()"
@@ -111,12 +113,20 @@
 ReportingHeaderInvalidNameItem=Antet de raportare: denumire nevalidă a grupului.
 ReportingHeaderDuplicateGroup=Antet de raportare: se ignoră grupul în duplicat cu denumirea „%S".
 ReportingHeaderInvalidItem=Antet de raportare: se ignoră elementul invalid cu denumirea „%S".
-ReportingHeaderInvalidEndpoint=Antet de raportare: se ignoră punctul terminal invalid pentru elementul cu denumirea „%S".
+ReportingHeaderInvalidEndpoint=Antet de raportare: se ignoră punctul terminal nevalid pentru elementul cu denumirea „%S".
 # LOCALIZATION NOTE(ReportingHeaderInvalidURLEndpoint): %1$S is the invalid URL, %2$S is the group name
-ReportingHeaderInvalidURLEndpoint=Antet de raportare: se ignoră URL-ul punctului terminal invalid „%1$S” pentru elementul cu denumirea „%2$S".
+ReportingHeaderInvalidURLEndpoint=Antet de raportare: se ignoră URL-ul punctului terminal nevalid „%1$S” pentru elementul cu denumirea „%2$S".
 
 FeaturePolicyUnsupportedFeatureName=Feature Policy: Se ignoră denumirea funcționalității fără suport „%S”.
 # TODO: would be nice to add a link to the Feature-Policy MDN documentation here. See bug 1449501
-FeaturePolicyInvalidEmptyAllowValue= Politică funcționalitate: Se ignoră lista goală de permisiuni pentru funcționalitatea „%S”.
+FeaturePolicyInvalidEmptyAllowValue= Feature Policy: Se ignoră lista goală de permisiuni pentru funcționalitatea „%S”.
 # TODO: would be nice to add a link to the Feature-Policy MDN documentation here. See bug 1449501
-FeaturePolicyInvalidAllowValue=Politică funcționalitate: Se ignoră valoarea fără suport de permisiuni „%S”.
+FeaturePolicyInvalidAllowValue=Feature Policy: Se ignoră valoarea fără suport de permisiuni „%S”.
+
+# LOCALIZATION NOTE: "%1$S" is the limitation length (bytes) of referrer URI, "%2$S" is the origin of the referrer URI.
+# LOCALIZATION NOTE: "%1$S" is the limitation length (bytes) of referrer URI, "%2$S" is the origin of the referrer URI.
+
+# X-Frame-Options
+# LOCALIZATION NOTE: %1$S is the header value, %2$S is frame URI and %3$S is the parent document URI.
+# LOCALIZATION NOTE: %1$S is the header value, %2$S is frame URI and %3$S is the parent document URI.
+# LOCALIZATION NOTE: %1$S is the header value, %2$S is frame URI and %3$S is the parent document URI.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/security/manager/chrome/pipnss/nsserrors.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/security/manager/chrome/pipnss/nsserrors.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/security/manager/chrome/pipnss/nsserrors.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/security/manager/chrome/pipnss/nsserrors.properties	2019-09-15 11:39:00.000000000 +0000
@@ -27,20 +27,20 @@
 SSL_ERROR_BAD_BLOCK_PADDING=SSL a primit o înregistrare cu blocuri formatate greșit.
 SSL_ERROR_RX_RECORD_TOO_LONG=SSL a primit o înregistrare care depășește lungimea maximă permisă.
 SSL_ERROR_TX_RECORD_TOO_LONG=SSL a încercat să trimită o listă care depășește lungimea maximă permisă.
-SSL_ERROR_RX_MALFORMED_HELLO_REQUEST=SSL a primit un mesaj „Hello Request” de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_CLIENT_HELLO=SSL a primit un mesaj „Client Hello” de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_SERVER_HELLO=SSL a primit un mesaj „Server Hello” de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_CERTIFICATE=SSL a primit un mesaj „Certificat” de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_SERVER_KEY_EXCH=SSL a primit un mesaj „Server Key Exchange” de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_CERT_REQUEST=SSL a primit un mesaj „Certificate Request” de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_HELLO_DONE=SSL a primit un mesaj „Server Hello Done” de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_CERT_VERIFY=SSL a primit un mesaj „Certificate Verify” de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_CLIENT_KEY_EXCH=SSL a primit un mesaj „Client Key Exchange” de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_FINISHED=SSL a primit un mesaj „Finished” de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER=SSL a primit o înregistrare formatată greșit de tip „Change Cipher Spec”.
-SSL_ERROR_RX_MALFORMED_ALERT=SSL a primit o înregistrare de tip Alert formatată greșit.
-SSL_ERROR_RX_MALFORMED_HANDSHAKE=SSL a primit un registru de confirmare a conexiunii de format greșit.
-SSL_ERROR_RX_MALFORMED_APPLICATION_DATA=SSL a primit o înregistrare de tip Application Data formatată greșit.
+SSL_ERROR_RX_MALFORMED_HELLO_REQUEST=SSL a primit un mesaj malformat „Hello Request” de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_CLIENT_HELLO=SSL a primit un mesaj malformat „Client Hello” de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_SERVER_HELLO=SSL a primit un mesaj malformat „Server Hello” de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_CERTIFICATE=SSL a primit un mesaj malformat „Certificate” de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_SERVER_KEY_EXCH=SSL a primit un mesaj malformat „Server Key Exchange” de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_CERT_REQUEST=SSL a primit un mesaj malformat „Certificate Request” de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_HELLO_DONE=SSL a primit un mesaj malformat „Server Hello Done” de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_CERT_VERIFY=SSL a primit un mesaj malformat „Certificate Verify” de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_CLIENT_KEY_EXCH=SSL a primit un mesaj malformat „Client Key Exchange” de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_FINISHED=SSL a primit un mesaj malformat „Finished” de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_CHANGE_CIPHER=SSL a primit o înregistrare malformată „Change Cipher Spec”.
+SSL_ERROR_RX_MALFORMED_ALERT=SSL a primit o înregistrare malformată „Alert”.
+SSL_ERROR_RX_MALFORMED_HANDSHAKE=SSL a primit o înregistrare malformată de confirmare a conexiunii.
+SSL_ERROR_RX_MALFORMED_APPLICATION_DATA=SSL a primit o înregistrare malformată „Application Data”.
 SSL_ERROR_RX_UNEXPECTED_HELLO_REQUEST=SSL a primit un mesaj „Hello Request” de confirmare a conexiunii neașteptat.
 SSL_ERROR_RX_UNEXPECTED_CLIENT_HELLO=SSL a primit un mesaj „Client Hello” de confirmare a conexiunii neașteptat.
 SSL_ERROR_RX_UNEXPECTED_SERVER_HELLO=SSL a primit un mesaj „Server Hello” de confirmare a conexiunii neașteptat.
@@ -110,19 +110,19 @@
 SSL_ERROR_BAD_CERT_STATUS_RESPONSE_ALERT=Partenerul de conexiune SSL nu a putut să obțină un răspuns OCSP pentru certificatul său.
 SSL_ERROR_BAD_CERT_HASH_VALUE_ALERT=Partenerul de conexiune SSL a raportat o valoare hash greșită a certificatului.
 SSL_ERROR_RX_UNEXPECTED_NEW_SESSION_TICKET=SSL a primit un mesaj „New Session Ticket” de confirmare a conexiunii neașteptat.
-SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL a primit un mesaj „New Session Ticket” de confirmare a conexiunii de format greșit.
+SSL_ERROR_RX_MALFORMED_NEW_SESSION_TICKET=SSL a primit un mesaj malformat „New Session Ticket” de confirmare a conexiunii.
 SSL_ERROR_DECOMPRESSION_FAILURE=SSL a primit o înregistrare comprimată care nu a putut fi decomprimată.
 SSL_ERROR_RENEGOTIATION_NOT_ALLOWED=Renegocierea nu este permisă pe acest socket SSL.
 SSL_ERROR_UNSAFE_NEGOTIATION=Partenerul de conexiune a încercat o confirmare de conexiune pe stil vechi (potențial vulnerabilă).
 SSL_ERROR_RX_UNEXPECTED_UNCOMPRESSED_RECORD=SSL a primit o înregistrare neașteptată necomprimată.
 SSL_ERROR_WEAK_SERVER_EPHEMERAL_DH_KEY=SSL a primit o cheie temporară slabă „Diffie-Hellman” în mesajul „Server Key Exchange” de confirmare a conexiunii.
-SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID=SSL a primit date invalide de la extensia NPN.
+SSL_ERROR_NEXT_PROTOCOL_DATA_INVALID=SSL a primit date nevalide de la extensia NPN.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SSL2=Funcția SSL nu este suportată de conexiunile SSL 2.0.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_SERVERS=Funcția SSL nu este suportată de servere.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_CLIENTS=Funcția SSL nu este suportată de clienți.
 SSL_ERROR_INVALID_VERSION_RANGE=Intervalul versiunii SSL nu este valid.
 SSL_ERROR_CIPHER_DISALLOWED_FOR_VERSION=Partenerul de conexiune SSL a selectat o suită de cifrare nepermisă pentru versiunea protocolului selectată.
-SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST=SSL a primit un mesaj „Hello Verify Request” de confirmare a conexiunii de format greșit.
+SSL_ERROR_RX_MALFORMED_HELLO_VERIFY_REQUEST=SSL a primit un mesaj malformat „Hello Verify Request” de confirmare a conexiunii.
 SSL_ERROR_RX_UNEXPECTED_HELLO_VERIFY_REQUEST=SSL a primit un mesaj „Hello Verify Request” de confirmare a conexiunii neașteptat.
 SSL_ERROR_FEATURE_NOT_SUPPORTED_FOR_VERSION=Funcția SSL nu este suportată de versiunea protocolului.
 SSL_ERROR_RX_UNEXPECTED_CERT_STATUS=SSL a primit un mesaj „Certificate Status” de confirmare a conexiunii neașteptat.
@@ -143,10 +143,10 @@
 SEC_ERROR_BAD_DATA=biblioteca de securitate: s-au primit date greșite.
 SEC_ERROR_OUTPUT_LEN=biblioteca de securitate: lungimea ieșirii este eronată.
 SEC_ERROR_INPUT_LEN=biblioteca de securitate a dat peste o lungime eronată a intrării.
-SEC_ERROR_INVALID_ARGS=bibliotecă de securitate: argumente invalide.
-SEC_ERROR_INVALID_ALGORITHM=bibliotecă de securitate: algoritm invalid.
-SEC_ERROR_INVALID_AVA=bibliotecă de securitate: AVA invalid.
-SEC_ERROR_INVALID_TIME=Șir pentru timp în format incorect.
+SEC_ERROR_INVALID_ARGS=biblioteca de securitate: argumente nevalide.
+SEC_ERROR_INVALID_ALGORITHM=bibliotecă de securitate: algoritm nevalid.
+SEC_ERROR_INVALID_AVA=bibliotecă de securitate: AVA nevalid.
+SEC_ERROR_INVALID_TIME=Șir pentru timp formatat necorespunzător.
 SEC_ERROR_BAD_DER=biblioteca de securitate: mesaj codat cu DER în format impropriu.
 SEC_ERROR_BAD_SIGNATURE=Certificatul partenerului are o semnătură nevalidă.
 SEC_ERROR_EXPIRED_CERTIFICATE=Certificatul partenerului a expirat.
@@ -171,12 +171,12 @@
 SEC_ERROR_EXPIRED_ISSUER_CERTIFICATE=Certificatul emitentului certificatului a expirat. Verifică data și ora sistemului de operare.
 SEC_ERROR_CRL_EXPIRED=CRL-ul emitentului certificatului a expirat. Actualizați-l sau verificați data și ora sistemului.
 SEC_ERROR_CRL_BAD_SIGNATURE=Lista CRL pentru emitentul certificatului are o semnătură nevalidă.
-SEC_ERROR_CRL_INVALID=Noul CRL are un format invalid.
+SEC_ERROR_CRL_INVALID=Noul CRL are un format nevalid.
 SEC_ERROR_EXTENSION_VALUE_INVALID=Extensia certificatului este nevalidă.
 SEC_ERROR_EXTENSION_NOT_FOUND=Nu s-a găsit extensia certificatului.
-SEC_ERROR_CA_CERT_INVALID=Certificatul de emitent este invalid.
+SEC_ERROR_CA_CERT_INVALID=Certificatul de emitent este nevalid.
 SEC_ERROR_PATH_LEN_CONSTRAINT_INVALID=Restricția pentru lungimea căii certificatului este nevalidă.
-SEC_ERROR_CERT_USAGES_INVALID=Câmpul de utilizare a certificatului este invalid.
+SEC_ERROR_CERT_USAGES_INVALID=Câmpul de utilizare a certificatului este nevalid.
 SEC_INTERNAL_ONLY=**Modul DOAR pentru uz intern**
 SEC_ERROR_INVALID_KEY=Cheia nu suportă operația cerută.
 SEC_ERROR_UNKNOWN_CRITICAL_EXTENSION=Certificatul conține o extensie critică necunoscută.
@@ -194,13 +194,13 @@
 XP_SEC_FORTEZZA_MORE_INFO=Te rugăm să selectezi o personalitate pentru mai multe informații
 XP_SEC_FORTEZZA_PERSON_NOT_FOUND=Personalitatea nu a fost găsită
 XP_SEC_FORTEZZA_NO_MORE_INFO=Nu sunt alte informații despre această personalitate
-XP_SEC_FORTEZZA_BAD_PIN=Pin invalid
+XP_SEC_FORTEZZA_BAD_PIN=Pin nevalid
 XP_SEC_FORTEZZA_PERSON_ERROR=Nu se pot inițializa personalitățile Fortezza.
 SEC_ERROR_NO_KRL=Niciun KRL pentru certificatul acestui site nu s-a găsit.
 SEC_ERROR_KRL_EXPIRED=KRL-ul pentru certificatul acestui site a expirat.
 SEC_ERROR_KRL_BAD_SIGNATURE=KRL-ul pentru certificatul acestui site are o semnătură nevalidă.
 SEC_ERROR_REVOKED_KEY=Cheia pentru certificatul acestui site a fost revocată.
-SEC_ERROR_KRL_INVALID=Noul KRL are un format invalid.
+SEC_ERROR_KRL_INVALID=Noul KRL are un format nevalid.
 SEC_ERROR_NEED_RANDOM=biblioteca de securitate: e nevoie de date aleatoare.
 SEC_ERROR_NO_MODULE=biblioteca de securitate: niciun modul de securitate nu poate executa operația cerută.
 SEC_ERROR_NO_TOKEN=Cardul de securitate sau codul (token) nu există, trebuie inițializat sau a fost eliminat.
@@ -217,7 +217,7 @@
 SEC_ERROR_EXPORTING_CERTIFICATES=Eroare la încercarea de export a certificatelor.
 SEC_ERROR_IMPORTING_CERTIFICATES=Eroare la încercarea de import a certificatelor.
 SEC_ERROR_PKCS12_DECODING_PFX=Nu se poate importa. Eroare la decodare. Fișierul nu este valid.
-SEC_ERROR_PKCS12_INVALID_MAC=Nu se poate importa. MAC invalid. Parolă incorectă sau fișier corupt.
+SEC_ERROR_PKCS12_INVALID_MAC=Nu se poate importa. MAC nevalid. Parolă incorectă sau fișier corupt.
 SEC_ERROR_PKCS12_UNSUPPORTED_MAC_ALGORITHM=Nu se poate importa. Algoritmul MAC nu este suportat.
 SEC_ERROR_PKCS12_UNSUPPORTED_TRANSPORT_MODE=Nu se poate importa. Sunt suportate numai modurile de integritate a parolei și confidențialitate.
 SEC_ERROR_PKCS12_CORRUPT_PFX_STRUCTURE=Nu se poate importa. Structura fișierului este coruptă.
@@ -255,10 +255,10 @@
 SEC_ERROR_CRL_NOT_YET_VALID=Lista de revocări de certificate pentru acest certificat nu e încă validă.
 SEC_ERROR_UNKNOWN_CERT=Nu se poate găsi certificatul cerut.
 SEC_ERROR_UNKNOWN_SIGNER=Nu se poate găsi certificatul semnatarului.
-SEC_ERROR_CERT_BAD_ACCESS_LOCATION=Locația serverului de stare a certificatului are un format invalid.
+SEC_ERROR_CERT_BAD_ACCESS_LOCATION=Locația serverului de stare a certificatului are un format nevalid.
 SEC_ERROR_OCSP_UNKNOWN_RESPONSE_TYPE=Răspunsul OCSP nu poate fi decodificat complet; este de tip necunoscut.
-SEC_ERROR_OCSP_BAD_HTTP_RESPONSE=Serverul OCSP a returnat date HTTP neașteptate/invalide.
-SEC_ERROR_OCSP_MALFORMED_REQUEST=Serverul OCSP consideră cererea coruptă sau formatată incorect.
+SEC_ERROR_OCSP_BAD_HTTP_RESPONSE=Serverul OCSP a returnat date HTTP neașteptate/nevalide.
+SEC_ERROR_OCSP_MALFORMED_REQUEST=Serverul OCSP consideră cererea coruptă sau formatată necorespunzător.
 SEC_ERROR_OCSP_SERVER_ERROR=Serverul OCSP a avut o eroare internă.
 SEC_ERROR_OCSP_TRY_SERVER_LATER=Serverul OCSP sugerează sa încerci din nou mai târziu.
 SEC_ERROR_OCSP_REQUEST_NEEDS_SIG=Serverul OCSP cere o semnătură în această cerere.
@@ -267,14 +267,14 @@
 SEC_ERROR_OCSP_UNKNOWN_CERT=Serverul OCSP nu cunoaște starea acestui certificat.
 SEC_ERROR_OCSP_NOT_ENABLED=Trebuie să activezi OCSP înainte de a executa această operație.
 SEC_ERROR_OCSP_NO_DEFAULT_RESPONDER=Trebuie să setați răspunzătorul implicit pentru OCSP înainte de a efectua această operație.
-SEC_ERROR_OCSP_MALFORMED_RESPONSE=Răspunsul de la serverul OCSP a fost corupt sau formatat incorect.
+SEC_ERROR_OCSP_MALFORMED_RESPONSE=Răspunsul de la serverul OCSP a fost corupt sau formatat necorespunzător.
 SEC_ERROR_OCSP_UNAUTHORIZED_RESPONSE=Semnatarul răspunsului OCSP nu este autorizat să dea stare acestui certificat.
 SEC_ERROR_OCSP_FUTURE_RESPONSE=Răspunsul OCSP nu este încă valid (conține o dată din viitor).
 SEC_ERROR_OCSP_OLD_RESPONSE=Răspunsul OCSP conține informații expirate.
 SEC_ERROR_DIGEST_NOT_FOUND=Nu s-a găsit CMS sau PKCS #7 Digest mesajul semnat.
 SEC_ERROR_UNSUPPORTED_MESSAGE_TYPE=Tipul de mesaj CMS sau PKCS #7 nu este suportat.
 SEC_ERROR_MODULE_STUCK=Modulul PKCS #11 nu poate fi eliminat deoarece este încă în uz.
-SEC_ERROR_BAD_TEMPLATE=Datele ASN.1 nu au putut fi decodificate. Șablonul specificat este invalid.
+SEC_ERROR_BAD_TEMPLATE=Datele ASN.1 nu au putut fi decodificate. Șablonul specificat este nevalid.
 SEC_ERROR_CRL_NOT_FOUND=Nu s-a găsit nicio listă CRL potrivită.
 SEC_ERROR_REUSED_ISSUER_AND_SERIAL=Ați încercat să importați un certificat cu același emitent/serial cu al unuia existent, deși nu e vorba de același certificat.
 SEC_ERROR_BUSY=NSS nu poate fi terminat. Obiectele sunt încă utilizate.
@@ -282,7 +282,7 @@
 SEC_ERROR_UNSUPPORTED_ELLIPTIC_CURVE=Curbă eliptică fără suport.
 SEC_ERROR_UNSUPPORTED_EC_POINT_FORM=Formă de punct de curbă eliptică fără suport.
 SEC_ERROR_UNRECOGNIZED_OID=Identificator nerecunoscut de obiect.
-SEC_ERROR_OCSP_INVALID_SIGNING_CERT=Certificat de semnare OCSP invalid în răspunsul OCSP.
+SEC_ERROR_OCSP_INVALID_SIGNING_CERT=Certificat de semnare OCSP nevalid în răspunsul OCSP.
 SEC_ERROR_REVOKED_CERTIFICATE_CRL=Certificatul este revocat în lista de revocări a emitentului.
 SEC_ERROR_REVOKED_CERTIFICATE_OCSP=Răspunzătorul emitentului OCSP raportează certificatul ca fiind revocat.
 SEC_ERROR_CRL_INVALID_VERSION=Lista de revocări a emitentului are un număr de versiune necunoscut.
@@ -294,7 +294,7 @@
 SEC_ERROR_CRL_ALREADY_EXISTS=Lista CRL există deja.
 SEC_ERROR_NOT_INITIALIZED=NSS nu este inițializat.
 SEC_ERROR_TOKEN_NOT_LOGGED_IN=Operația a eșuat pentru că codul PKCS#11 nu este autentificat.
-SEC_ERROR_OCSP_RESPONDER_CERT_INVALID=Certificatul respondentului OCSP configurat este invalid.
+SEC_ERROR_OCSP_RESPONDER_CERT_INVALID=Certificatul respondentului OCSP configurat este nevalid.
 SEC_ERROR_OCSP_BAD_SIGNATURE=Răspunsul OCSP are o semnatură nevalidă.
 SEC_ERROR_OUT_OF_SEARCH_LIMITS=Căutarea validării certificatului este în afara limitelor de căutare
 SEC_ERROR_INVALID_POLICY_MAPPING=Maparea politicii de securitate conține anypolicy
@@ -313,7 +313,7 @@
 SEC_ERROR_EXPIRED_PASSWORD=Parola a expirat.
 SEC_ERROR_LOCKED_PASSWORD=Parola e blocată.
 SEC_ERROR_UNKNOWN_PKCS11_ERROR=Eroare PKCS #11 necunoscută.
-SEC_ERROR_BAD_CRL_DP_URL=URL invalid sau fără suport în denumirea punctului de distribuție CRL.
+SEC_ERROR_BAD_CRL_DP_URL=URL nevalid sau fără suport în denumirea punctului de distribuție CRL.
 SEC_ERROR_CERT_SIGNATURE_ALGORITHM_DISABLED=The certificate was signed using an signature algorithm that is disabled because it is not secure.
 MOZILLA_PKIX_ERROR_KEY_PINNING_FAILURE=Serverul folosește fixarea cheilor publice (HPKP), însă nu a putut fi construit niciun lanț de certificate de încredere care să se coreleze la setul de fixare. Încălcările mecanismului de fixare a cheilor nu pot fi ocolite.
 MOZILLA_PKIX_ERROR_CA_CERT_USED_AS_END_ENTITY=Serverul folosește un certificat cu o extensie de constrângeri de bază care îl identifică drept autoritate de certificare. Nu ar fi cazul, dacă ar fi un certificat emis corespunzător.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/security/manager/chrome/pipnss/pipnss.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/security/manager/chrome/pipnss/pipnss.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/security/manager/chrome/pipnss/pipnss.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/security/manager/chrome/pipnss/pipnss.properties	2019-09-15 11:39:00.000000000 +0000
@@ -258,7 +258,7 @@
 # LOCALIZATION NOTE (SSLConnectionErrorPrefix2): %1$S is the host string, %2$S is more detailed information (localized as well).
 SSLConnectionErrorPrefix2=A apărut o eroare în timpul conectării la %1$S. %2$S\n
 
-certErrorIntro=%S folosește un certificat de securitate invalid.
+certErrorIntro=%S folosește un certificat de securitate nevalid.
 
 certErrorTrust_SelfSigned=Certificatul nu prezintă încredere deoarece este semnat de el însuși.
 certErrorTrust_UnknownIssuer=Certificatul nu prezintă încredere deoarece certificatul emitentului este necunoscut.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/security/manager/security/certificates/certManager.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/security/manager/security/certificates/certManager.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/security/manager/security/certificates/certManager.ftl	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/security/manager/security/certificates/certManager.ftl	2019-09-15 11:39:00.000000000 +0000
@@ -200,14 +200,14 @@
 cert-not-verified-cert-not-trusted = Nu se poate verifica acest certificat deoarece nu este acreditat.
 cert-not-verified-issuer-not-trusted = Nu se poate verifica acest certificat deoarece emitentul nu prezintă încredere.
 cert-not-verified-issuer-unknown = Nu se poate verifica acest certificat deoarece emitentul nu e cunoscut.
-cert-not-verified-ca-invalid = Nu se poate verifica acest certificat deoarece certificatul AC este invalid.
+cert-not-verified-ca-invalid = Nu se poate verifica acest certificat deoarece certificatul AC este nevalid.
 cert-not-verified_algorithm-disabled = Nu am putut verifica acest certificat pentru că a fost semnat utilizând un algoritm de semnare care a fost dezactivat pentru că algoritmul nu este securizat.
 cert-not-verified-unknown = Nu se poate verifica acest certificat din motive necunoscute.
 
 ## Add Security Exception dialog
 
 add-exception-branded-warning = Ești pe cale să schimbi modul în care { -brand-short-name } identifică acest site.
-add-exception-invalid-header = Acest site încearcă să se identifice cu informații invalide.
+add-exception-invalid-header = Acest site încearcă să se identifice cu informații nevalide.
 add-exception-domain-mismatch-short = Site greșit
 add-exception-domain-mismatch-long = Certificatul aparține unui alt site, ceea ce ar putea însemna că cineva încearcă să uzurpe identitatea acestui site.
 add-exception-expired-short = Informații depășite
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/chrome/global/videocontrols.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/chrome/global/videocontrols.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/chrome/global/videocontrols.dtd	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/chrome/global/videocontrols.dtd	2019-09-15 11:39:00.000000000 +0000
@@ -38,7 +38,7 @@
 <!ENTITY error.noSource2 "Nu s-a găsit niciun videoclip cu format sau tip MIME suportat.">
 <!ENTITY error.generic "Redarea videoclipului a fost abandonată datorită unei erori necunoscute.">
 
-<!ENTITY status.pictureInPicture "Acest videoclip este redat în modul imagine-în-imagine.">
+<!ENTITY status.pictureInPicture "Acest videoclip este redat în modul Picture-in-Picture.">
 
 <!-- LOCALIZATION NOTE (scrubberScale.nameFormat): the #1 string is the current
 media position, and the #2 string is the total duration. For example, when at
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/chrome/mozapps/profile/createProfileWizard.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/chrome/mozapps/profile/createProfileWizard.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/chrome/mozapps/profile/createProfileWizard.dtd	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/chrome/mozapps/profile/createProfileWizard.dtd	2019-09-15 11:39:00.000000000 +0000
@@ -14,7 +14,7 @@
 <!ENTITY profileCreationExplanation_4Gnome.text  "Pentru a începe să-ți creezi profilul, dă clic pe Înainte.">
 
 <!-- Second wizard page -->
-<!ENTITY profileCreationIntro.text      "Dacă creezi mai multe profiluri, le poți deosebi după numele profilurilor. Poți folosi numele sugerat aici sau numele pe care îl dorești tu.">
+<!ENTITY profileCreationIntro.text      "Dacă creezi mai multe profiluri, le poți deosebi după denumirile profilurilor. Poți folosi denumirea sugerată aici sau denumirea pe care o dorești tu.">
 <!ENTITY profilePrompt.label            "Introdu numele noului profil:">
 <!ENTITY profilePrompt.accesskey        "e">
 <!ENTITY profileDirectoryExplanation.text   "Setările utilizatorului, preferințele și alte date legate de utilizator vor fi stocate în:">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/chrome/mozapps/profile/profileSelection.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/chrome/mozapps/profile/profileSelection.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/chrome/mozapps/profile/profileSelection.dtd	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/chrome/mozapps/profile/profileSelection.dtd	2019-09-15 11:39:00.000000000 +0000
@@ -7,7 +7,7 @@
 
 <!ENTITY            windowtitle.label      "&brandShortName; - Alege profilul de utilizator">
 
-<!ENTITY            profilename.label      "Nume profil:">
+<!ENTITY            profilename.label      "Numele profilului:">
 
 <!ENTITY            start.label            "Pornește &brandShortName;">
 <!ENTITY            exit.label             "Ieși">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/chrome/mozapps/profile/profileSelection.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/chrome/mozapps/profile/profileSelection.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/chrome/mozapps/profile/profileSelection.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/chrome/mozapps/profile/profileSelection.properties	2019-09-15 11:39:00.000000000 +0000
@@ -26,7 +26,7 @@
 renameProfilePrompt=Redenumește profilul „%S” în:
 
 profileNameInvalidTitle=Denumire nevalidă de profil
-profileNameInvalid=Numele de profil „%S” nu este permis.
+profileNameInvalid=Denumirea de profil „%S” nu este permisă.
 
 chooseFolder=Alege dosarul profilului
 profileNameEmpty=Nu este permis ca numele profilului să fie gol.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/chrome/mozapps/update/updates.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/chrome/mozapps/update/updates.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/chrome/mozapps/update/updates.properties	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/chrome/mozapps/update/updates.properties	2019-09-15 11:39:01.000000000 +0000
@@ -2,11 +2,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# LOCALIZATION NOTE: The 1st %S is the update name and the 2nd %S is the build
-# identifier from the local updates.xml for displaying update history
-# example: MyApplication (20081022033543)
-updateFullName=%S (%S)
-
 # LOCALIZATION NOTE: The 1st %S is brandShortName and 2nd %S is update version
 # where update version from the update xml
 # example: MyApplication 10.0.5
@@ -22,8 +17,6 @@
 
 # LOCALIZATION NOTE: When present %S is brandShortName
 verificationError=%S nu poate confirma integritatea pachetului de actualizare.
-resumePausedAfterCloseTitle=Actualizare program
-resumePausedAfterCloseMsg=Ai pus în pauză descărcarea acestei actualizări. Vrei să descarci actualizarea în fundal în timp ce continui să folosești %S?
 updaterIOErrorTitle=Actualizarea programului a eșuat
 updaterIOErrorMsg=Unul sau mai multe fișiere nu au putut fi actualizate. Te rugăm să te asiguri că orice alte instanțe de %S sunt închise și că ai permisiunea de a modifica fișiere, iar apoi repornește %S pentru a încerca din nou.
 okButton=Ok
@@ -52,8 +45,6 @@
 statusSucceededFormat=Instalată la: %S
 
 statusFailed=Instalare eșuată
-pauseButtonPause=Pauză
-pauseButtonResume=Continuare
 hideButton=Ascunde
 hideButton.accesskey=A
 
@@ -67,11 +58,7 @@
 patchApplyFailure=Actualizarea nu a putut fi instalată (Aplicarea peticului a eșuat)
 elevationFailure=Nu ai permisiunile necesare pentru a instala această actualizare. Te rugăm să contactezi administratorul de sistem.
 
-# LOCALIZATION NOTE: %S is the amount downloaded so far
-# example: Paused —  879 KB of 2.1 MB
-downloadPausedStatus=Pusă pe pauză — %S
-
-check_error-200=Fișier XML de actualizare incorect (200)
+check_error-200=Fișier malformat XML de actualizare (200)
 check_error-403=Acces refuzat (403)
 check_error-404=Nu s-a găsit fișierul XML de actualizare (404)
 check_error-500=Eroare internă a serverului (500)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/toolkit/about/aboutProfiles.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/toolkit/about/aboutProfiles.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/toolkit/about/aboutProfiles.ftl	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/toolkit/about/aboutProfiles.ftl	2019-09-15 11:39:00.000000000 +0000
@@ -42,7 +42,7 @@
 profiles-invalid-profile-name-title = Denumire nevalidă de profil
 # Variables:
 #   $name (String) - Name of the profile
-profiles-invalid-profile-name = Numele de profil „{ $name }” nu este permis.
+profiles-invalid-profile-name = Denumirea de profil „{ $name }” nu este permisă.
 profiles-delete-profile-title = Șterge profilul
 # Variables:
 #   $dir (String) - Path to be displayed
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/toolkit/about/url-classifier.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/toolkit/about/url-classifier.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/ro/toolkit/toolkit/about/url-classifier.ftl	2019-09-13 05:18:10.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/ro/toolkit/toolkit/about/url-classifier.ftl	2019-09-15 11:39:00.000000000 +0000
@@ -8,7 +8,7 @@
 url-classifier-search-result-uri = URI: { $uri }
 url-classifier-search-result-list = Listă de tabele: { $list }
 url-classifier-search-input = URL
-url-classifier-search-error-invalid-url = URL invalid
+url-classifier-search-error-invalid-url = URL nevalid
 url-classifier-search-error-no-features = Nicio funcționalitate selectată
 url-classifier-search-btn = Începe căutarea
 url-classifier-search-features = Funcționalități
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/sr/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/sr/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/sr/browser/browser/newtab/asrouter.ftl	2019-09-13 05:18:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/sr/browser/browser/newtab/asrouter.ftl	2019-09-15 11:39:23.000000000 +0000
@@ -92,6 +92,7 @@
 
 ## Login Sync
 
+cfr-doorhanger-sync-logins-header = Немојте поново изгубити лозинку
 cfr-doorhanger-sync-logins-ok-button = Укључите { -sync-brand-short-name }
     .accesskey = т
 
@@ -108,3 +109,6 @@
 cfr-doorhanger-firefox-send-header = Делите овај PDF безбедно
 cfr-doorhanger-firefox-send-ok-button = Испробајте { -send-brand-name }
     .accesskey = И
+
+## Social Tracking Protection
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/sr/browser/browser/protections.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/sr/browser/browser/protections.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/sr/browser/browser/protections.ftl	2019-09-13 05:18:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/sr/browser/browser/protections.ftl	2019-09-15 11:39:23.000000000 +0000
@@ -10,6 +10,7 @@
 graph-today = Данас
 social-tab-title = Пратиоци с друштвених мрежа
 tracker-tab-title = Садржај који прати
+lockwise-title = Немојте поново заборавити лозинку
 turn-on-sync = Укључите { -sync-brand-short-name }…
     .title = Отворите подешавања синхронизовања
 auto-scan = Аутоматски скенирано данас
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/sr/toolkit/chrome/global/textcontext.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/sr/toolkit/chrome/global/textcontext.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/sr/toolkit/chrome/global/textcontext.dtd	2019-09-13 05:18:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/sr/toolkit/chrome/global/textcontext.dtd	2019-09-15 11:39:23.000000000 +0000
@@ -29,6 +29,7 @@
 
 <!ENTITY fillLoginMenu.label          "Попуни пријаву">
 <!ENTITY fillLoginMenu.accesskey      "П">
+<!ENTITY fillGeneratedPassword.label  "Користите безбедно направљену лозинку">
 <!ENTITY fillPasswordMenu.label       "Попуни лозинку">
 <!ENTITY fillPasswordMenu.accesskey   "П">
 <!ENTITY fillUsernameMenu.label       "Попуни корисничко име">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/sr/toolkit/chrome/passwordmgr/passwordmgr.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/sr/toolkit/chrome/passwordmgr/passwordmgr.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/sr/toolkit/chrome/passwordmgr/passwordmgr.properties	2019-09-13 05:18:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/sr/toolkit/chrome/passwordmgr/passwordmgr.properties	2019-09-15 11:39:23.000000000 +0000
@@ -40,18 +40,16 @@
 updatePasswordMsg = Да ли желите да ажурирате снимљене лозинке за "%S"?
 updatePasswordMsgNoUser = Да ли желите да ажурирање снимљену лозинку?
 userSelectText2 = Изаберите пријаву да се ажурира:
-hidePasswords=Сакриј лозинке
-hidePasswordsAccessKey=о
-showPasswords=Прикажи лозинке
-showPasswordsAccessKey=к
-noMasterPasswordPrompt=Да ли сте сигурни да желите да прикажете ваше лозинке?
-removeAllPasswordsPrompt=Да ли сте сигурни да желите да уклоните све лозинке?
-removeAllPasswordsTitle=Уклони све лозинке
 removeLoginPrompt=Да ли сигурни да желите да уклоните ову пријаву?
 removeLoginTitle=Уклони пријаву
-autofillLoginsAndPasswords = Самостално попуњавај пријаве и лозинке
 loginsDescriptionAll2=Пријаве за следеће сајтове су складиштене на вашем рачунару
-loginsDescriptionFiltered=Наведене пријаве се подударају са претрагом:
+
+# LOCALIZATION NOTE (useGeneratedPassword):
+# Shown in the autocomplete popup to allow filling a generated password into a password field.
+
+# LOCALIZATION NOTE (useASecurelyGeneratedPassword):
+# Shown in the autocomplete popup to allow filling a generated password into a password field.
+useASecurelyGeneratedPassword=Користите безбедно направљену лозинку
 # LOCALIZATION NOTE (loginHostAge):
 # This is used to show the context menu login items with their age.
 # 1st string is the username for the login, 2nd is the login's age.
@@ -59,6 +57,7 @@
 # LOCALIZATION NOTE (noUsername):
 # String is used on the context menu when a login doesn't have a username.
 noUsername=Нема корисничког имена
+
 duplicateLoginTitle=Пријава већ постоји
 duplicateLogin=Пријава већ постоји.
 
@@ -71,14 +70,3 @@
 # LOCALIZATION NOTE (viewSavedLogins.label):
 # This label is used in the footer of login autocomplete menus.
 viewSavedLogins.label= Погледај сачуване пријаве
-
-# LOCALIZATION NOTE (removeAll, removeAllShown):
-# removeAll and removeAllShown are both used on the same one button,
-# never displayed together and can share the same accesskey.
-# When only partial sites are shown as a result of keyword search,
-# removeAllShown is displayed as button label.
-# removeAll is displayed when no keyword search and all sites are shown.
-removeAll.label=Уклони све
-removeAll.accesskey=У
-removeAllShown.label=Уклони све приказане
-removeAllShown.accesskey=У
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/sv-SE/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/sv-SE/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/sv-SE/toolkit/toolkit/about/certviewer.ftl	2019-09-13 05:18:34.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/sv-SE/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:39:29.000000000 +0000
@@ -15,6 +15,8 @@
 certificate-viewer-certificate-authority = Certifikatutfärdare
 certificate-viewer-cipher-suite = Chiffersvit
 certificate-viewer-common-name = Vanligt namn
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-country = Företagets hemland
 certificate-viewer-country = Land
 certificate-viewer-curve = Kurva
 certificate-viewer-distribution-point = Distributionspunkt
@@ -38,7 +40,11 @@
 certificate-viewer-protocol = Protokoll
 certificate-viewer-public-value = Offentligt värde
 certificate-viewer-purposes = Ändamål
+certificate-viewer-qualifier = Qualifier
+certificate-viewer-qualifiers = Qualifiers
 certificate-viewer-required = Krävs
+# Inc. means Incorporated, e.g GitHub is incorporated in Delaware
+certificate-viewer-inc-state-province = Företagets hemstat/provins
 certificate-viewer-state-province = Stat/provins
 certificate-viewer-sha-1 = SHA-1
 certificate-viewer-sha-256 = SHA-256
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/th/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/th/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/th/browser/chrome/browser/browser.dtd	2019-09-13 05:18:42.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/th/browser/chrome/browser/browser.dtd	2019-09-15 11:39:39.000000000 +0000
@@ -76,12 +76,21 @@
 <!ENTITY menubarCmd.label "แถบเมนู">
 <!ENTITY menubarCmd.accesskey "ถ">
 <!ENTITY navbarCmd.label "แถบเครื่องมือนำทาง">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
+<!ENTITY navbar.accessibleLabel "การนำทาง">
 <!ENTITY personalbarCmd.label "แถบเครื่องมือที่คั่นหน้า">
 <!ENTITY personalbarCmd.accesskey "บ">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
+<!ENTITY personalbar.accessibleLabel "ที่คั่นหน้า">
 <!ENTITY bookmarksToolbarItem.label "รายการแถบเครื่องมือที่คั่นหน้า">
 
 <!ENTITY pageSourceCmd.label "ต้นฉบับหน้า">
 <!ENTITY pageSourceCmd.accesskey "ต">
+
 <!ENTITY pageSourceCmd.commandkey "u">
 <!-- LOCALIZATION NOTE (pageSourceCmd.SafariCommandKey should match the
 Option+Command keyboard shortcut letter that Safari and Chrome use for "View
@@ -92,6 +101,7 @@
 
 <!ENTITY pageInfoCmd.label "ข้อมูลหน้า">
 <!ENTITY pageInfoCmd.accesskey "ข">
+
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY ldbCmd.label "ตัวดีบั๊กเค้าโครง">
 <!ENTITY ldbCmd.accesskey "ต">
@@ -117,6 +127,8 @@
 <!ENTITY fxaUnverified.label "ยืนยันบัญชีของคุณ">
 
 
+ <!-- } is above this key on many keyboards -->
+
 <!ENTITY fullScreenMinimize.tooltip "ย่อ">
 <!ENTITY fullScreenRestore.tooltip "คืนสภาพ">
 <!ENTITY fullScreenClose.tooltip "ปิด">
@@ -145,6 +157,10 @@
      followed by the user's email. -->
 <!ENTITY fxa.menu.signedInAs.label "ลงชื่อเข้าเป็น">
 <!ENTITY fxa.menu.manageAccount.label "จัดการบัญชี…">
+
+<!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
+     for the Firefox Account toolbar menu screen. The `Signed in as` text is
+     followed by the user's email. -->
 <!ENTITY fxa.menu.syncSettings.label "การตั้งค่า &syncBrand.shortName.label;…">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "เชื่อมต่ออุปกรณ์อื่น…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
@@ -195,6 +211,7 @@
 
 <!ENTITY bookmarksMenu.label "ที่คั่นหน้า">
 <!ENTITY bookmarksMenu.accesskey "ท">
+
 <!ENTITY bookmarkThisPageCmd.label "เพิ่มที่คั่นหน้าสำหรับหน้านี้">
 <!ENTITY editThisBookmarkCmd.label "แก้ไขที่คั่นหน้านี้">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -510,6 +527,7 @@
      This is set as the aria-label attribute for the search input box in the
      in-content search UI, to be used by screen readers. -->
 <!ENTITY contentSearchInput.label     "คำค้นหา">
+
 <!ENTITY contentSearchSubmit.tooltip  "ค้นหา">
 
 <!-- LOCALIZATION NOTE (searchInput.placeholder):
@@ -968,6 +986,8 @@
 <!ENTITY contentBlocking.cookies.label "คุกกี้">
 <!ENTITY contentBlocking.cookiesView.label "คุกกี้และข้อมูลไซต์">
 
+<!ENTITY contentBlocking.manageSettings2.accesskey "M">
+
 <!ENTITY contentBlocking.socialblock.label "ตัวติดตามสังคมออนไลน์">
 
 <!ENTITY contentBlocking.cookies2.label "คุกกี้ติดตามข้ามไซต์">
@@ -982,6 +1002,7 @@
 <!ENTITY contentBlocking.breakageReportView.label "รายงานปัญหา">
 <!ENTITY contentBlocking.breakageReportView2.description "การบล็อกเนื้อหาอาจทำให้เกิดปัญหากับบางเว็บไซต์ได้ เมื่อคุณรายงานปัญหา นั่นก็เท่ากับคุณช่วยทำให้ &brandShortName; ดีขึ้นสำหรับทุกๆ คน (การดำเนินการนี้จะส่ง URL พร้อมทั้งข้อมูลเกี่ยวกับการตั้งค่าเบราว์เซอร์ของคุณไปให้กับ Mozilla)">
 <!ENTITY contentBlocking.breakageReportView.learnMore "เรียนรู้เพิ่มเติม">
+
 <!ENTITY contentBlocking.breakageReportView.title "รายงานไซต์ที่ใช้งานไม่ได้">
 <!ENTITY contentBlocking.breakageReportView3.description "การปิดกั้นตัวติดตามบางตัวอาจทำให้เกิดปัญหากับบางเว็บไซต์ได้ การรายงานปัญหา ก็เท่ากับคุณช่วยทำให้ &brandShortName; ดีขึ้นสำหรับทุก ๆ คน การรายงานนี้จะส่ง URL พร้อมทั้งข้อมูลเกี่ยวกับการตั้งค่าเบราว์เซอร์ของคุณไปให้กับ Mozilla">
 <!ENTITY contentBlocking.breakageReportView2.learnMore "เรียนรู้เพิ่มเติม">
@@ -1037,6 +1058,7 @@
 <!ENTITY newTabControlled.disableButton.accesskey "ป">
 
 <!ENTITY homepageControlled.message "ส่วนขยายได้เปลี่ยนสิ่งที่คุณเห็นเป็นหน้าแรกของคุณ คุณสามารถเรียกคืนการตั้งค่าของคุณหากคุณไม่ต้องการการเปลี่ยนแปลงนี้">
+
 <!ENTITY homepageControlled.header.message "หน้าแรกของคุณมีการเปลี่ยนแปลง">
 <!ENTITY homepageControlled.keepButton.label "เก็บการเปลี่ยนแปลง">
 <!ENTITY homepageControlled.keepButton.accesskey "ก">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/browser/browser/newtab/asrouter.ftl	2019-09-13 05:18:45.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/browser/browser/newtab/asrouter.ftl	2019-09-15 11:39:46.000000000 +0000
@@ -93,8 +93,8 @@
 # localization, because it would result in the number showing twice.
 cfr-whatsnew-tracking-blocked-title =
     { $blockedCount ->
-        [one] takipçi engellendi
-       *[other] takipçi engellendi
+        [one] Engellediğimiz takipçi sayısı
+       *[other] Engellediğimiz takipçi sayısı
     }
 cfr-whatsnew-tracking-blocked-subtitle = { DATETIME($earliestDate, month: "long", year: "numeric") } tarihinden beri
 cfr-whatsnew-tracking-blocked-link-text = Raporu görüntüle
@@ -102,7 +102,7 @@
 cfr-whatsnew-lockwise-backup-body = Giriş yaptığınız her yerden ulaşabileceğiniz, güvenli parolalar oluşturun.
 cfr-whatsnew-lockwise-backup-link-text = Yedeklemeyi aç
 cfr-whatsnew-lockwise-take-title = Parolalarınızı yanınızda taşıyın
-cfr-whatsnew-lockwise-take-body = { -lockwise-brand-short-name } mobil uygulaması, yedeklediğiniz parolalara her yerden güvenli ulaşmanızı sağlar.
+cfr-whatsnew-lockwise-take-body = { -lockwise-brand-short-name } mobil uygulaması, yedeklediğiniz parolalara her yerden güvenle ulaşmanızı sağlar.
 cfr-whatsnew-lockwise-take-link-text = Uygulamayı indir
 
 ## Bookmark Sync
@@ -133,3 +133,12 @@
 cfr-doorhanger-firefox-send-body = Uçtan uca şifreleme ve işiniz bittiğinde kaybolan bir bağlantıyla hassas belgelerinizi meraklı gözlerden koruyun.
 cfr-doorhanger-firefox-send-ok-button = { -send-brand-name }’i deneyin
     .accesskey = d
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Korumalara bak
+    .accesskey = K
+cfr-doorhanger-socialtracking-close-button = Kapat
+    .accesskey = a
+cfr-doorhanger-socialtracking-heading = { -brand-short-name } bir sosyal ağın sizi izlemesini engelledi
+cfr-doorhanger-socialtracking-description = Gizliliğiniz bizim için önemli. { -brand-short-name } artık yaygın sosya medya takipçilerini engelliyor, böylece internette yaptıklarınız hakkında daha az veri toplayabilmelerini sağlıyor.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/browser/browser/preferences/preferences.ftl	2019-09-13 05:18:45.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/browser/browser/preferences/preferences.ftl	2019-09-15 11:39:46.000000000 +0000
@@ -745,6 +745,23 @@
 content-blocking-custom-desc = Nelerin engelleneceğini seçin.
 content-blocking-private-trackers = Bilinen takipçileri yalnızca gizli pencelerde engeller
 content-blocking-third-party-cookies = Üçüncü taraf takip çerezlerini engeller
+
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
+# "Standard" in this case is an adjective, meaning "default" or "normal".
+enhanced-tracking-protection-setting-standard =
+    .label = Standart
+    .accesskey = d
+enhanced-tracking-protection-setting-strict =
+    .label = Sıkı
+    .accesskey = S
+enhanced-tracking-protection-setting-custom =
+    .label = Özel
+    .accesskey = Ö
+
+
+
 content-blocking-etp-standard-desc = Dengeli koruma ve performans. Sayfalar normal şekilde yüklenir.
 content-blocking-etp-strict-desc = Daha güçlü koruma, ama bazı siteler ve içerikler düzgün çalışmayabilir.
 content-blocking-etp-custom-desc = Hangi takipçilerin ve betiklerin engelleneceğini seçin.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/browser/chrome/browser/browser.dtd	2019-09-13 05:18:45.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/browser/chrome/browser/browser.dtd	2019-09-15 11:39:46.000000000 +0000
@@ -76,12 +76,20 @@
 <!ENTITY menubarCmd.label "Menü çubuğu">
 <!ENTITY menubarCmd.accesskey "M">
 <!ENTITY navbarCmd.label "Gezinti araç çubuğu">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
 <!ENTITY personalbarCmd.label "Yer imleri araç çubuğu">
 <!ENTITY personalbarCmd.accesskey "Y">
+<!-- LOCALIZATION NOTE: The accessibleLabel is a spoken label that should not
+include the word "toolbar" or such, because screen readers already know that
+this container is a toolbar. This avoids double-speaking. -->
+<!ENTITY personalbar.accessibleLabel "Yer imleri">
 <!ENTITY bookmarksToolbarItem.label "Yer imleri araç çubuğu öğeleri">
 
 <!ENTITY pageSourceCmd.label "Sayfa kaynağı">
 <!ENTITY pageSourceCmd.accesskey "a">
+
 <!ENTITY pageSourceCmd.commandkey "u">
 <!-- LOCALIZATION NOTE (pageSourceCmd.SafariCommandKey should match the
 Option+Command keyboard shortcut letter that Safari and Chrome use for "View
@@ -92,6 +100,7 @@
 
 <!ENTITY pageInfoCmd.label "Sayfa bilgileri">
 <!ENTITY pageInfoCmd.accesskey "b">
+
 <!ENTITY pageInfoCmd.commandkey "i">
 <!ENTITY ldbCmd.label "Düzen hata ayıklayıcısı">
 <!ENTITY ldbCmd.accesskey "D">
@@ -117,6 +126,8 @@
 <!ENTITY fxaUnverified.label "Hesabınızı doğrulayın">
 
 
+ <!-- } is above this key on many keyboards -->
+
 <!ENTITY fullScreenMinimize.tooltip "Küçült">
 <!ENTITY fullScreenRestore.tooltip "Geri getir">
 <!ENTITY fullScreenClose.tooltip "Kapat">
@@ -145,6 +156,10 @@
      followed by the user's email. -->
 <!ENTITY fxa.menu.signedInAs.label "Giriş yapan kullanıcı">
 <!ENTITY fxa.menu.manageAccount.label "Hesabı yönet…">
+
+<!-- LOCALIZATION NOTE (fxa.menu) Used to define the different labels
+     for the Firefox Account toolbar menu screen. The `Signed in as` text is
+     followed by the user's email. -->
 <!ENTITY fxa.menu.syncSettings.label "&syncBrand.shortName.label; ayarları…">
 <!ENTITY fxa.menu.connectAnotherDevice2.label "Başka bir cihaz bağla…">
 <!ENTITY fxa.menu.firefoxAccount "&syncBrand.fxAccount.label;">
@@ -195,6 +210,7 @@
 
 <!ENTITY bookmarksMenu.label "Yer imleri">
 <!ENTITY bookmarksMenu.accesskey "Y">
+
 <!ENTITY bookmarkThisPageCmd.label "Bu sayfayı yer imlerine ekle">
 <!ENTITY editThisBookmarkCmd.label "Bu yer imini düzenle">
 <!ENTITY bookmarkThisPageCmd.commandkey "d">
@@ -510,6 +526,7 @@
      This is set as the aria-label attribute for the search input box in the
      in-content search UI, to be used by screen readers. -->
 <!ENTITY contentSearchInput.label     "Arama sorgusu">
+
 <!ENTITY contentSearchSubmit.tooltip  "Aramayı gönder">
 
 <!-- LOCALIZATION NOTE (searchInput.placeholder):
@@ -972,6 +989,7 @@
 <!ENTITY contentBlocking.cookies.label "Çerezler">
 <!ENTITY contentBlocking.cookiesView.label "Çerezler ve site verileri">
 
+
 <!ENTITY contentBlocking.socialblock.label "Sosyal medya takipçileri">
 
 <!ENTITY contentBlocking.cookies2.label "Siteler arası takip çerezleri">
@@ -986,6 +1004,7 @@
 <!ENTITY contentBlocking.breakageReportView.label "Sorun bildir">
 <!ENTITY contentBlocking.breakageReportView2.description "İçerik engelleme bazı web sitelerinde sorunlara yol açabilir. Bu sorunları bize bildirirseniz &brandShortName; tarayıcısını iyileştirme şansımız olur. (Sorunlu sayfanın adresi ve tarayıcı ayarlarınızla ilgili bilgiler Mozilla’ya gönderilecektir.)">
 <!ENTITY contentBlocking.breakageReportView.learnMore "Daha fazla bilgi al">
+
 <!ENTITY contentBlocking.breakageReportView.title "Bozuk Bir Siteyi Bildirin">
 <!ENTITY contentBlocking.breakageReportView3.description "Bazı takipçileri engellemek bazı web sitelerinde sorunlara yol açabilir. Bu sorunları bize bildirirseniz &brandShortName; tarayıcısını iyileştirme şansımız olur. Bu rapor, sayfanın adresini ve tarayıcı ayarlarınızla ilgili bilgileri Mozilla’ya gönderir.">
 <!ENTITY contentBlocking.breakageReportView2.learnMore "Daha fazla bilgi alın">
@@ -1041,6 +1060,7 @@
 <!ENTITY newTabControlled.disableButton.accesskey "E">
 
 <!ENTITY homepageControlled.message "Bir eklenti, giriş sayfanızı değiştirdi. Bu değişikliği istemiyorsanız önceki ayarlarınızı geri yükleyebilirsiniz.">
+
 <!ENTITY homepageControlled.header.message "Giriş sayfanız değişti.">
 <!ENTITY homepageControlled.keepButton.label "Değişiklikleri koru">
 <!ENTITY homepageControlled.keepButton.accesskey "D">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/devtools/client/debugger.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/devtools/client/debugger.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/devtools/client/debugger.properties	2019-09-13 05:18:45.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/devtools/client/debugger.properties	2019-09-15 11:39:46.000000000 +0000
@@ -218,10 +218,6 @@
 # source.
 blackboxCheckboxTooltip2=Kara kutulamayı aç/kapat
 
-# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
-# DOM Mutation Breakpoints pane when there are no events.
-noDomMutationBreakpointsText=Görüntülenecek kesme noktası yok.
-
 # LOCALIZATION NOTE (noDomMutationBreakpoints): The text to
 # display in the DOM Mutation Breakpoints pane when there are no events.
 # %S will be replaced by an active link using inspectorTool as text
@@ -229,6 +225,14 @@
 # LOCALIZATION NOTE (inspectorTool): The text to describe the the Inspector tool
 inspectorTool=Denetçi
 
+# LOCALIZATION NOTE (eventListenersHeader1.placeholder): The placeholder text in
+# the event search input bar
+eventListenersHeader1.placeholder=Olay türüne göre filtrele
+
+# LOCALIZATION NOTE (noDomMutationBreakpointsText): The text to display in the
+# DOM Mutation Breakpoints pane when there are no events.
+noDomMutationBreakpointsText=Görüntülenecek kesme noktası yok.
+
 # LOCALIZATION NOTE (domMutationHeader): The text to display in the
 # DOM Mutation Breakpoints header
 domMutationHeader=DOM mutasyonu kesme noktaları
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/devtools/client/toolbox.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/devtools/client/toolbox.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/devtools/client/toolbox.properties	2019-09-13 05:18:45.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/devtools/client/toolbox.properties	2019-09-15 11:39:46.000000000 +0000
@@ -285,6 +285,21 @@
 # shown in the web replay timeline marker
 toolbox.replay.jumpMessage=%1$S. mesaja atla
 
+# LOCALIZATION NOTE (toolbox.replay.jumpMessage2): This is the label
+# shown in the web replay timeline marker
+
+# LOCALIZATION NOTE (toolbox.replay.resume): This is the text that appears in the
+# Replay command bar to prompt the user to resume the program.
+toolbox.replay.resume=Sürdür
+
+# LOCALIZATION NOTE (toolbox.replay.rewind): This is the text that appears in the
+# Replay command bar to prompt the user to rewind the program.
+toolbox.replay.rewind=Geri sar
+
+# LOCALIZATION NOTE (toolbox.replay.pause): This is the text that appears in the
+# Replay command bar to prompt the user to pause the program.
+toolbox.replay.pause=Duraklat
+
 # LOCALIZATION NOTE (toolbox.debugTargetErrorPage.title): This is the title
 # for the Error view shown by the toolbox when a connection to a debug target
 # could not be made
@@ -295,7 +310,7 @@
 # has happened while trying to connect to a debug target
 toolbox.debugTargetErrorPage.description = Hata ayıklama hedefine bağlanılamadı. Aşağıdaki hata ayrıntılarına bakın:
 
-# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the 
+# LOCALIZATION NOTE (options.deprecationNotice): This is the text that appears in the
 # settings panel for panel that will be removed in future releases.
 # This entire text is treated as a link to an MDN page.
 options.deprecationNotice=Kullanımdan kaldırıldı. Daha fazla bilgi alın…
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/tr/toolkit/toolkit/about/certviewer.ftl	2019-09-13 05:18:45.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/tr/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:39:46.000000000 +0000
@@ -32,11 +32,14 @@
 certificate-viewer-policy = İlke
 certificate-viewer-protocol = Protokol
 certificate-viewer-purposes = Amaçlar
+certificate-viewer-qualifier = Niteleyici
+certificate-viewer-qualifiers = Niteleyiciler
 certificate-viewer-required = Gerekli
 certificate-viewer-sha-1 = SHA-1
 certificate-viewer-sha-256 = SHA-256
 certificate-viewer-serial-number = Seri numarası
 certificate-viewer-signature-algorithm = İmza algoritması
+certificate-viewer-signature-scheme = İmza şeması
 certificate-viewer-timestamp = Zaman damgası
 certificate-viewer-value = Değer
 certificate-viewer-version = Sürüm
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/uk/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/uk/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/uk/toolkit/toolkit/about/certviewer.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/uk/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:39:53.000000000 +0000
@@ -0,0 +1,27 @@
+# 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/.
+
+certificate-viewer-certificate-section-title = Сертифікат
+
+## Error messages
+
+certificate-viewer-error-title = Щось пішло не так.
+
+## Certificate information labels
+
+certificate-viewer-algorithm = Алгоритм
+certificate-viewer-common-name = Загальна назва
+certificate-viewer-country = Країна
+certificate-viewer-curve = Крива
+certificate-viewer-dns-name = Ім’я DNS
+certificate-viewer-purposes = Призначення
+certificate-viewer-qualifier = Кваліфікатор
+certificate-viewer-sha-1 = SHA-1
+certificate-viewer-sha-256 = SHA-256
+certificate-viewer-serial-number = Серійний номер
+certificate-viewer-signature-algorithm = Алгоритм підпису
+certificate-viewer-signature-scheme = Схема підпису
+certificate-viewer-value = Значення
+certificate-viewer-version = Версія
+certificate-viewer-business-category = Бізнес-категорія
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/vi/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/vi/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/vi/browser/browser/newtab/asrouter.ftl	2019-09-13 05:18:56.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/vi/browser/browser/newtab/asrouter.ftl	2019-09-15 11:40:03.000000000 +0000
@@ -136,3 +136,16 @@
 cfr-doorhanger-firefox-send-body = Giữ các tài liệu nhạy cảm của bạn an toàn khỏi những con mắt tò mò với mã hóa đầu cuối và một liên kết sẽ biến mất khi bạn thực hiện xong.
 cfr-doorhanger-firefox-send-ok-button = Thử { -send-brand-name }
     .accesskey = T
+
+## Social Tracking Protection
+
+cfr-doorhanger-socialtracking-ok-button = Xem mục bảo vệ
+    .accesskey = P
+cfr-doorhanger-socialtracking-close-button = Đóng
+    .accesskey = C
+cfr-doorhanger-socialtracking-heading = { -brand-short-name } đã dừng mạng xã hội mà nó theo dõi bạn tại đây
+cfr-doorhanger-socialtracking-description = Vấn đề riêng tư của bạn. { -brand-short-name } hiện chặn các trình theo dõi phương tiện truyền thông xã hội phổ biến, giới hạn số lượng dữ liệu họ có thể thu thập về những gì bạn làm trực tuyến.
+cfr-doorhanger-fingerprinters-heading = { -brand-short-name } đã chặn một dấu vân tay trên trang này
+cfr-doorhanger-fingerprinters-description = Vấn đề riêng tư của bạn. { -brand-short-name } hiện chặn các dấu vân tay, mà nó thu thập các mẫu thông tin nhận dạng duy nhất về thiết bị của bạn để theo dõi bạn.
+cfr-doorhanger-cryptominers-heading = { -brand-short-name } đã chặn một loại tiền điện tử trên trang này
+cfr-doorhanger-cryptominers-description = Vấn đề riêng tư của bạn. { -brand-short-name } hiện chặn các loại tiền điện tử, mà nó sử dụng sức mạnh tính toán của hệ thống của bạn để khai thác tiền kỹ thuật số.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/vi/browser/browser/preferences/preferences.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/vi/browser/browser/preferences/preferences.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/vi/browser/browser/preferences/preferences.ftl	2019-09-13 05:18:56.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/vi/browser/browser/preferences/preferences.ftl	2019-09-15 11:40:03.000000000 +0000
@@ -709,8 +709,8 @@
 ## Privacy Section - Content Blocking
 
 content-blocking-header = Chặn nội dung
-content-blocking-enhanced-tracking-protection = Trình chống theo dõi nâng cao
 content-blocking-section-description = Bảo vệ riêng tư của bạn trong khi bạn duyệt. Chặn nội dung vô hình của các trang web bạn đang xem truy cập và hồ sơ bạn. Chặn một số nội dung này có thể làm cho các trang tải nhanh hơn.
+content-blocking-enhanced-tracking-protection = Trình chống theo dõi nâng cao
 content-blocking-section-top-level-description = Trình theo dõi theo bạn trên mạng để thu thập thông tin về thói quen và sở thích duyệt web của bạn. { -brand-short-name } chặn nhiều trình theo dõi và các tập lệnh độc hại khác.
 content-blocking-learn-more = Tìm hiểu thêm
 # The terminology used to refer to categories of Content Blocking is also used in chrome/browser/browser.properties and should be translated consistently.
@@ -729,6 +729,23 @@
 content-blocking-custom-desc = Chọn những gì bạn muốn chặn.
 content-blocking-private-trackers = Trình theo dõi được biết chỉ trong cửa sổ riêng tư
 content-blocking-third-party-cookies = Cookie theo dõi của bên thứ ba
+
+## These strings are used to define the different levels of
+## Enhanced Tracking Protection.
+
+# "Standard" in this case is an adjective, meaning "default" or "normal".
+enhanced-tracking-protection-setting-standard =
+    .label = Tiêu chuẩn
+    .accesskey = d
+enhanced-tracking-protection-setting-strict =
+    .label = Nghiêm ngặt
+    .accesskey = r
+enhanced-tracking-protection-setting-custom =
+    .label = Tùy chỉnh
+    .accesskey = C
+
+
+
 content-blocking-etp-standard-desc = Cân bằng để bảo vệ và hiệu suất. Các trang sẽ tải bình thường.
 content-blocking-etp-strict-desc = Bảo vệ mạnh mẽ hơn, nhưng có thể khiến một số trang web và nội dung bị phá vỡ.
 content-blocking-etp-custom-desc = Chọn trình theo dõi và tập lệnh để chặn.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/vi/browser/chrome/browser/browser.dtd firefox-trunk-71.0~a1~hg20190915r493291/l10n/vi/browser/chrome/browser/browser.dtd
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/vi/browser/chrome/browser/browser.dtd	2019-09-13 05:18:56.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/vi/browser/chrome/browser/browser.dtd	2019-09-15 11:40:03.000000000 +0000
@@ -991,6 +991,8 @@
 <!ENTITY contentBlocking.cookies.label "Cookie">
 <!ENTITY contentBlocking.cookiesView.label "Cookie và dữ liệu trang">
 
+<!ENTITY contentBlocking.manageSettings2.accesskey "M">
+
 <!ENTITY contentBlocking.socialblock.label "Trình theo dõi truyền thông xã hội">
 
 <!ENTITY contentBlocking.cookies2.label "Cookie theo dõi chéo trang web">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/vi/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/vi/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/vi/toolkit/toolkit/about/certviewer.ftl	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/vi/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:40:03.000000000 +0000
@@ -0,0 +1,45 @@
+# 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/.
+
+certificate-viewer-certificate-section-title = Chứng chỉ
+
+## Error messages
+
+certificate-viewer-error-message = Chúng tôi không thể tìm thấy thông tin chứng chỉ, hoặc chứng chỉ bị hỏng. Vui lòng thử lại.
+certificate-viewer-error-title = Có gì đó không ổn.
+
+## Certificate information labels
+
+certificate-viewer-algorithm = Thuật toán
+certificate-viewer-certificate-authority = Cơ quan cấp chứng chỉ
+certificate-viewer-cipher-suite = Bộ mật mã
+certificate-viewer-common-name = Tên gọi chung
+certificate-viewer-dns-name = Tên DNS
+certificate-viewer-exponent = Chỉ số
+certificate-viewer-id = ID
+certificate-viewer-key-id = ID khóa
+certificate-viewer-key-size = Kích thước khóa
+certificate-viewer-location = Địa chỉ
+certificate-viewer-logid = ID bản ghi
+certificate-viewer-method = Phương thức
+certificate-viewer-modulus = Mô-đun
+certificate-viewer-name = Tên
+certificate-viewer-not-after = Hiệu lực đến
+certificate-viewer-not-before = Hiệu lực từ
+certificate-viewer-organization = Tổ chức
+certificate-viewer-organizational-unit = Đơn vị tổ chức
+certificate-viewer-policy = Chính sách
+certificate-viewer-protocol = Giao thức
+certificate-viewer-public-value = Giá trị công khai
+certificate-viewer-purposes = Mục đích
+certificate-viewer-required = Bắt buộc
+certificate-viewer-sha-1 = SHA-1
+certificate-viewer-sha-256 = SHA-256
+certificate-viewer-serial-number = Số sê-ri
+certificate-viewer-signature-algorithm = Thuật toán chữ ký
+certificate-viewer-signature-scheme = Sơ đồ chữ ký
+certificate-viewer-timestamp = Dấu thời gian
+certificate-viewer-value = Giá trị
+certificate-viewer-version = Phiên bản
+certificate-viewer-business-category = Hạng mục kinh doanh
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/vi/toolkit/toolkit/global/processTypes.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/vi/toolkit/toolkit/global/processTypes.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/vi/toolkit/toolkit/global/processTypes.ftl	2019-09-13 05:18:56.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/vi/toolkit/toolkit/global/processTypes.ftl	2019-09-15 11:40:03.000000000 +0000
@@ -18,6 +18,9 @@
 # process used to isolate webpages that requested special
 # permission to allocate large amounts of memory
 process-type-weblargeallocation = Phân bổ lớn
+# process used to isolate a webpage from other web pages
+# to improve security
+process-type-webisolated = Nội dung web bị cô lập
 # process used to communicate with the GPU for
 # graphics acceleration
 process-type-gpu = GPU
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-CN/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-CN/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-CN/browser/browser/newtab/asrouter.ftl	2019-09-13 05:19:01.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-CN/browser/browser/newtab/asrouter.ftl	2019-09-15 11:40:13.000000000 +0000
@@ -93,7 +93,7 @@
     { $blockedCount ->
        *[other] 跟踪器拦截数量
     }
-cfr-whatsnew-tracking-blocked-subtitle = 自 { DATETIME($earliestDate, month: "long", year: "numeric") } 起
+cfr-whatsnew-tracking-blocked-subtitle = 自{ DATETIME($earliestDate, month: "long", year: "numeric") }起
 cfr-whatsnew-tracking-blocked-link-text = 查看报告
 cfr-whatsnew-lockwise-backup-title = 备份您的密码
 cfr-whatsnew-lockwise-backup-body = 立即生成安全密码，并可在您登录的任何设备访问。
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-CN/browser/browser/protections.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-CN/browser/browser/protections.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-CN/browser/browser/protections.ftl	2019-09-13 05:19:01.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-CN/browser/browser/protections.ftl	2019-09-15 11:40:13.000000000 +0000
@@ -14,7 +14,7 @@
 # earliest date recorded in the database.
 graph-total-tracker-summary =
     { $count ->
-       *[other] 自 { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") } 起，已拦截 <b>{ $count }</b> 个跟踪器
+       *[other] 自{ DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }起，已拦截 <b>{ $count }</b> 个跟踪器
     }
 # The terminology used to refer to categories of Content Blocking is also used in chrome/browser/browser.properties and should be translated consistently.
 # "Standard" in this case is an adjective, meaning "default" or "normal".
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-CN/browser/chrome/browser/browser.properties firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-CN/browser/chrome/browser/browser.properties
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-CN/browser/chrome/browser/browser.properties	2019-09-13 05:19:01.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-CN/browser/chrome/browser/browser.properties	2019-09-15 11:40:13.000000000 +0000
@@ -720,7 +720,7 @@
 protections.footer.blockedTrackerCounter.description=已拦截 #1 个
 # LOCALIZATION NOTE (protections.footer.blockedTrackerCounter.tooltip):
 #   %S is the date on which we started counting (e.g., July 17, 2019).
-protections.footer.blockedTrackerCounter.tooltip=自 %S 起
+protections.footer.blockedTrackerCounter.tooltip=自%S起
 
 # Edit Bookmark UI
 editBookmarkPanel.newBookmarkTitle=新建书签
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-TW/browser/browser/newtab/asrouter.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-TW/browser/browser/newtab/asrouter.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-TW/browser/browser/newtab/asrouter.ftl	2019-09-13 05:19:04.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-TW/browser/browser/newtab/asrouter.ftl	2019-09-15 11:40:20.000000000 +0000
@@ -91,7 +91,7 @@
 # localization, because it would result in the number showing twice.
 cfr-whatsnew-tracking-blocked-title =
     { $blockedCount ->
-       *[other] 個被封鎖的追蹤器
+       *[other] 追蹤器封鎖數量
     }
 cfr-whatsnew-tracking-blocked-subtitle = 自 { DATETIME($earliestDate, month: "long", year: "numeric") } 起
 cfr-whatsnew-tracking-blocked-link-text = 檢視報告
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-TW/browser/browser/protections.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-TW/browser/browser/protections.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-TW/browser/browser/protections.ftl	2019-09-13 05:19:04.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-TW/browser/browser/protections.ftl	2019-09-15 11:40:20.000000000 +0000
@@ -12,14 +12,6 @@
 #   $count (Number) - Number of tracking events blocked.
 #   $earliestDate (Number) - Unix timestamp in ms, representing a date. The
 # earliest date recorded in the database.
-graph-total-summary =
-    { $count ->
-       *[other] 自 { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }起，封鎖了 { $count } 組追蹤器
-    }
-# Variables:
-#   $count (Number) - Number of tracking events blocked.
-#   $earliestDate (Number) - Unix timestamp in ms, representing a date. The
-# earliest date recorded in the database.
 graph-total-tracker-summary =
     { $count ->
        *[other] 自 { DATETIME($earliestDate, day: "numeric", month: "long", year: "numeric") }起，封鎖了 <b>{ $count }</b> 組追蹤器
@@ -44,7 +36,6 @@
 cookie-tab-title = 跨網站追蹤 Cookie
 cookie-tab-content = 一些第三方廣告商或分析公司，會設定這些 Cookie 在不同網站間跟蹤您，收集您的上網紀錄。封鎖這些跨網站 Cookie 可減少在網路上跟蹤您的廣告。<a data-l10n-name="learn-more-link">了解更多</a>
 tracker-tab-title = 追蹤用內容
-tracker-tab-content = 網站中可能會有含有追蹤用程式碼的外部廣告、影片、其他內容。封鎖追蹤內容可以讓網站更快載入，但某些按鈕、表單、登入欄位可能無法正常運作。<a data-l10n-name="learn-more-link">了解更多</a>
 tracker-tab-description = 網站中可能會有包含追蹤碼的外部廣告、影片或其他內容。封鎖追蹤內容可以讓網站更快載入，但某些按鈕、表單、登入欄位可能無法正常運作。<a data-l10n-name="learn-more-link">了解更多</a>
 fingerprinter-tab-title = 數位指紋追蹤程式
 fingerprinter-tab-content = 數位指紋追蹤程式會針對您的瀏覽器、電腦設定來建立您的獨特輪廓，並在不同網站間追蹤您。<a data-l10n-name="learn-more-link">了解更多</a>
@@ -54,7 +45,6 @@
 lockwise-title-logged-in = { -lockwise-brand-name }
 lockwise-header-content = { -lockwise-brand-name } 會安全地在您的瀏覽器中儲存密碼。
 lockwise-header-content-logged-in = 安全地儲存密碼，並同步到您的所有裝置中。
-open-about-logins-button = 用 { -brand-short-name } 開啟
 about-logins-view-logins-button = 檢視登入資訊
 lockwise-no-logins-content = 下載 <a data-l10n-name="lockwise-inline-link">{ -lockwise-brand-name }</a> App，把密碼隨身帶著走。
 # This string is displayed after a large numeral that indicates the total number
@@ -73,12 +63,9 @@
     { $count ->
        *[other] 與另 { $count } 部裝置同步
     }
-lockwise-sync-not-syncing = 未與其他裝置同步。
 lockwise-sync-not-syncing-devices = 未與其他裝置同步
 monitor-title = 檢查是否發生資料外洩事件
 monitor-link = 原理是什麼
-monitor-header-content = 使用 { -monitor-brand-name } 檢查您是否處於資料外洩事件之中，並在有新事件發生時收到通知。
-monitor-header-content-logged-in = 若您的資訊出現在已知的資料外洩事件中，{ -monitor-brand-name } 將警告您
 monitor-header-content-no-account = 使用 { -monitor-brand-name } 檢查您是否處於已知的資料外洩事件之中，並在有新事件發生時收到通知。
 monitor-header-content-signed-in = 若您的資訊出現在已知的資料外洩事件中，{ -monitor-brand-name } 將警告您。
 monitor-sign-up = 訂閱資料外洩警報
@@ -86,44 +73,23 @@
 # This string is displayed after a large numeral that indicates the total number
 # of email addresses being monitored. Don’t add $count to
 # your localization, because it would result in the number showing twice.
-info-monitored-addresses =
-    { $count ->
-       *[other] 組信箱監控中。
-    }
-# This string is displayed after a large numeral that indicates the total number
-# of known data breaches. Don’t add $count to
-# your localization, because it would result in the number showing twice.
-info-known-breaches =
-    { $count ->
-       *[other] 場資料外洩事件，流出了您的個資。
-    }
-# This string is displayed after a large numeral that indicates the total number
-# of exposed passwords. Don’t add $count to
-# your localization, because it would result in the number showing twice.
-info-exposed-passwords =
-    { $count ->
-       *[other] 組密碼在資料外洩事件中流出。
-    }
-# This string is displayed after a large numeral that indicates the total number
-# of email addresses being monitored. Don’t add $count to
-# your localization, because it would result in the number showing twice.
 info-monitored-emails =
     { $count ->
-       *[other] 監控中的電子郵件信箱地址
+       *[other] 組監控中的電子郵件信箱地址
     }
 # This string is displayed after a large numeral that indicates the total number
 # of known data breaches. Don’t add $count to
 # your localization, because it would result in the number showing twice.
 info-known-breaches-found =
     { $count ->
-       *[other] 場資料外洩事件，流出了您的個資。
+       *[other] 場資料外洩事件，流出了您的個資
     }
 # This string is displayed after a large numeral that indicates the total number
 # of exposed passwords. Don’t add $count to
 # your localization, because it would result in the number showing twice.
 info-exposed-passwords-found =
     { $count ->
-       *[other] 在所有事件中洩漏出的密碼
+       *[other] 所有事件中洩漏出的密碼組數
     }
 full-report-link = 到 <a data-l10n-name="monitor-inline-link">{ -monitor-brand-name }</a> 看完整報告
 # This string is displayed after a large numeral that indicates the total number
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-TW/toolkit/toolkit/about/certviewer.ftl firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-TW/toolkit/toolkit/about/certviewer.ftl
--- firefox-trunk-71.0~a1~hg20190913r492975/l10n/zh-TW/toolkit/toolkit/about/certviewer.ftl	2019-09-13 05:19:05.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/l10n/zh-TW/toolkit/toolkit/about/certviewer.ftl	2019-09-15 11:40:20.000000000 +0000
@@ -27,7 +27,7 @@
 certificate-viewer-key-id = 金鑰 ID
 certificate-viewer-key-size = 金鑰大小
 certificate-viewer-locality = 地區
-certificate-viewer-location = 地點
+certificate-viewer-location = 位置
 certificate-viewer-logid = Log ID
 certificate-viewer-method = 方法
 certificate-viewer-modulus = 模數
@@ -49,7 +49,7 @@
 certificate-viewer-sha-1 = SHA-1
 certificate-viewer-sha-256 = SHA-256
 certificate-viewer-serial-number = 序號
-certificate-viewer-signature-algorithm = 簽章演算碼
+certificate-viewer-signature-algorithm = 簽章演算法
 certificate-viewer-signature-scheme = 簽署方式
 certificate-viewer-timestamp = 時間戳記
 certificate-viewer-value = 值
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/base/nsLayoutUtils.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/base/nsLayoutUtils.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/base/nsLayoutUtils.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/base/nsLayoutUtils.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -6967,17 +6967,46 @@
     }
   }
 
-  // Compute our size in layer pixels. We may need to revisit this for Android
-  // because mobile websites are rarely displayed at a 1:1
-  // LayoutPixel:ScreenPixel ratio and the snapping here may be insufficient.
-  const LayerIntSize layerSize =
-      RoundedToInt(LayerSize(aDestRect.Width() * scaleFactors.width,
-                             aDestRect.Height() * scaleFactors.height));
-
-  // An empty size is unacceptable so we ensure our suggested size is at least
-  // 1 pixel wide/tall.
-  gfxSize gfxLayerSize =
-      gfxSize(std::max(layerSize.width, 1), std::max(layerSize.height, 1));
+  // Attempt to snap pixels, the same as ComputeSnappedImageDrawingParameters.
+  // Any changes to the algorithm here will need to be reflected there.
+  bool snapped = false;
+  gfxSize gfxLayerSize;
+  const gfx::Matrix& itm = aSc.GetInheritedTransform();
+  if (!itm.HasNonAxisAlignedTransform() && itm._11 > 0.0 && itm._22 > 0.0) {
+    gfxRect rect(gfxPoint(aDestRect.X(), aDestRect.Y()),
+                 gfxSize(aDestRect.Width(), aDestRect.Height()));
+
+    gfxPoint p1 = ThebesPoint(itm.TransformPoint(ToPoint(rect.TopLeft())));
+    gfxPoint p2 = ThebesPoint(itm.TransformPoint(ToPoint(rect.TopRight())));
+    gfxPoint p3 = ThebesPoint(itm.TransformPoint(ToPoint(rect.BottomRight())));
+
+    if (p2 == gfxPoint(p1.x, p3.y) || p2 == gfxPoint(p3.x, p1.y)) {
+      p1.Round();
+      p3.Round();
+
+      rect.MoveTo(gfxPoint(std::min(p1.x, p3.x), std::min(p1.y, p3.y)));
+      rect.SizeTo(gfxSize(std::max(p1.x, p3.x) - rect.X(),
+                          std::max(p1.y, p3.y) - rect.Y()));
+
+      // An empty size is unacceptable so we ensure our suggested size is at
+      // least 1 pixel wide/tall.
+      gfxLayerSize =
+          gfxSize(std::max(rect.Width(), 1.0), std::max(rect.Height(), 1.0));
+      snapped = true;
+    }
+  }
+
+  if (!snapped) {
+    // Compute our size in layer pixels.
+    const LayerIntSize layerSize =
+        RoundedToInt(LayerSize(aDestRect.Width() * scaleFactors.width,
+                               aDestRect.Height() * scaleFactors.height));
+
+    // An empty size is unacceptable so we ensure our suggested size is at least
+    // 1 pixel wide/tall.
+    gfxLayerSize =
+        gfxSize(std::max(layerSize.width, 1), std::max(layerSize.height, 1));
+  }
 
   return aImage->OptimalImageSizeForDest(
       gfxLayerSize, imgIContainer::FRAME_CURRENT, samplingFilter, aFlags);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/base/nsPresContext.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/base/nsPresContext.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/base/nsPresContext.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/base/nsPresContext.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -131,6 +131,10 @@
 }
 
 void nsPresContext::ForceReflowForFontInfoUpdate() {
+  // Flush the device context's font cache, so that we won't risk getting
+  // stale nsFontMetrics objects from it.
+  DeviceContext()->FlushFontCache();
+
   // We can trigger reflow by pretending a font.* preference has changed;
   // this is the same mechanism as gfxPlatform::ForceGlobalReflow() uses
   // if new fonts are installed during the session, for example.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/base/PresShell.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/base/PresShell.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/base/PresShell.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/base/PresShell.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -1913,8 +1913,19 @@
     return NS_OK;
   }
 
-  nsIFrame* rootFrame = mFrameConstructor->GetRootFrame();
-  if (!rootFrame) {
+  MOZ_ASSERT(!mPresContext->SuppressingResizeReflow(),
+             "Can't suppress resize reflow and shrink-wrap at the same time");
+
+  // Make sure that style is flushed before setting the pres context
+  // VisibleArea.
+  //
+  // Otherwise we may end up with bogus viewport units resolved against the
+  // unconstrained bsize, or restyling the whole document resolving viewport
+  // units against targetWidth, which may end up doing wasteful work.
+  mDocument->FlushPendingNotifications(FlushType::Frames);
+
+  nsIFrame* rootFrame = GetRootFrame();
+  if (mIsDestroying || !rootFrame) {
     // If we don't have a root frame yet, that means we haven't had our initial
     // reflow... If that's the case, and aWidth or aHeight is unconstrained,
     // ignore them altogether.
@@ -1931,123 +1942,57 @@
   }
 
   WritingMode wm = rootFrame->GetWritingMode();
-  const bool shrinkToFit = !!(aOptions & ResizeReflowOptions::BSizeLimit);
-  MOZ_ASSERT(shrinkToFit ||
-                 (wm.IsVertical() ? aWidth : aHeight) != NS_UNCONSTRAINEDSIZE,
-             "unconstrained bsize only usable with eBSizeLimit");
   MOZ_ASSERT((wm.IsVertical() ? aHeight : aWidth) != NS_UNCONSTRAINEDSIZE,
              "unconstrained isize not allowed");
-  bool isBSizeChanging =
-      wm.IsVertical() ? aOldWidth != aWidth : aOldHeight != aHeight;
+
   nscoord targetWidth = aWidth;
   nscoord targetHeight = aHeight;
-
-  if (shrinkToFit) {
-    if (wm.IsVertical()) {
-      targetWidth = NS_UNCONSTRAINEDSIZE;
-    } else {
-      targetHeight = NS_UNCONSTRAINEDSIZE;
+  if (wm.IsVertical()) {
+    targetWidth = NS_UNCONSTRAINEDSIZE;
+  } else {
+    targetHeight = NS_UNCONSTRAINEDSIZE;
+  }
+
+  mPresContext->SetVisibleArea(nsRect(0, 0, targetWidth, targetHeight));
+  // XXX Do a full invalidate at the beginning so that invalidates along
+  // the way don't have region accumulation issues?
+
+  // For height:auto BSizes (i.e. layout-controlled), descendant
+  // intrinsic sizes can't depend on them. So the only other case is
+  // viewport-controlled BSizes which we handle here.
+  nsLayoutUtils::MarkIntrinsicISizesDirtyIfDependentOnBSize(rootFrame);
+
+  {
+    nsAutoCauseReflowNotifier crNotifier(this);
+    WillDoReflow();
+
+    // Kick off a top-down reflow
+    AUTO_LAYOUT_PHASE_ENTRY_POINT(GetPresContext(), Reflow);
+    nsViewManager::AutoDisableRefresh refreshBlocker(mViewManager);
+
+    mDirtyRoots.Remove(rootFrame);
+    DoReflow(rootFrame, true, nullptr);
+
+    const bool reflowAgain =
+        wm.IsVertical() ? mPresContext->GetVisibleArea().width > aWidth
+                        : mPresContext->GetVisibleArea().height > aHeight;
+
+    if (reflowAgain) {
+      mPresContext->SetVisibleArea(nsRect(0, 0, aWidth, aHeight));
+      DoReflow(rootFrame, true, nullptr);
     }
-    isBSizeChanging = true;
-  }
-
-  const bool suppressingResizeReflow =
-      GetPresContext()->SuppressingResizeReflow();
-
-  RefPtr<nsViewManager> viewManager = mViewManager;
-  if (!suppressingResizeReflow && shrinkToFit) {
-    // Make sure that style is flushed before setting the pres context
-    // VisibleArea if we're shrinking to fit.
-    //
-    // Otherwise we may end up with bogus viewport units resolved against the
-    // unconstrained bsize, or restyling the whole document resolving viewport
-    // units against targetWidth, which may end up doing wasteful work.
-    mDocument->FlushPendingNotifications(FlushType::Frames);
-  }
-
-  if (!mIsDestroying) {
-    mPresContext->SetVisibleArea(nsRect(0, 0, targetWidth, targetHeight));
   }
 
-  if (!mIsDestroying && !suppressingResizeReflow) {
-    if (!shrinkToFit) {
-      // Flush styles _now_ (with the correct visible area) if not computing the
-      // shrink-to-fit size.
-      //
-      // We've asserted above that sizes are not unconstrained, so this is going
-      // to be the final size, which means that we'll get the (correct) final
-      // styles now, and avoid a further potentially-wasteful full recascade on
-      // the next flush.
-      mDocument->FlushPendingNotifications(FlushType::Frames);
-    }
-
-    rootFrame = mFrameConstructor->GetRootFrame();
-    if (!mIsDestroying && rootFrame) {
-      // XXX Do a full invalidate at the beginning so that invalidates along
-      // the way don't have region accumulation issues?
-
-      if (isBSizeChanging) {
-        // For BSize changes driven by style, RestyleManager handles this.
-        // For height:auto BSizes (i.e. layout-controlled), descendant
-        // intrinsic sizes can't depend on them. So the only other case is
-        // viewport-controlled BSizes which we handle here.
-        nsLayoutUtils::MarkIntrinsicISizesDirtyIfDependentOnBSize(rootFrame);
-      }
-
-      {
-        nsAutoCauseReflowNotifier crNotifier(this);
-        WillDoReflow();
-
-        // Kick off a top-down reflow
-        AUTO_LAYOUT_PHASE_ENTRY_POINT(GetPresContext(), Reflow);
-        nsViewManager::AutoDisableRefresh refreshBlocker(viewManager);
-
-        mDirtyRoots.Remove(rootFrame);
-        DoReflow(rootFrame, true, nullptr);
-
-        if (shrinkToFit) {
-          const bool reflowAgain =
-              wm.IsVertical() ? mPresContext->GetVisibleArea().width > aWidth
-                              : mPresContext->GetVisibleArea().height > aHeight;
-
-          if (reflowAgain) {
-            mPresContext->SetVisibleArea(nsRect(0, 0, aWidth, aHeight));
-            DoReflow(rootFrame, true, nullptr);
-          }
-        }
-      }
-
-      // the first DoReflow above should've set our bsize if it was
-      // NS_UNCONSTRAINEDSIZE, and the isize shouldn't be NS_UNCONSTRAINEDSIZE
-      // anyway
-      NS_ASSERTION(mPresContext->GetVisibleArea().width != NS_UNCONSTRAINEDSIZE,
-                   "width should not be NS_UNCONSTRAINEDSIZE after reflow");
-      NS_ASSERTION(
-          mPresContext->GetVisibleArea().height != NS_UNCONSTRAINEDSIZE,
-          "height should not be NS_UNCONSTRAINEDSIZE after reflow");
-
-      DidDoReflow(true);
-    }
-  }
+  DidDoReflow(true);
 
-  rootFrame = mFrameConstructor->GetRootFrame();
-  if (rootFrame) {
-    wm = rootFrame->GetWritingMode();
-    // reflow did not happen; if the reflow happened, our bsize should not be
-    // NS_UNCONSTRAINEDSIZE because DoReflow will fix it up to the same values
-    // as below
-    if (wm.IsVertical()) {
-      if (mPresContext->GetVisibleArea().width == NS_UNCONSTRAINEDSIZE) {
-        mPresContext->SetVisibleArea(
-            nsRect(0, 0, rootFrame->GetRect().width, aHeight));
-      }
-    } else {
-      if (mPresContext->GetVisibleArea().height == NS_UNCONSTRAINEDSIZE) {
-        mPresContext->SetVisibleArea(
-            nsRect(0, 0, aWidth, rootFrame->GetRect().height));
-      }
-    }
-  }
+  // the reflow above should've set our bsize if it was NS_UNCONSTRAINEDSIZE,
+  // and the isize shouldn't be NS_UNCONSTRAINEDSIZE anyway.
+  MOZ_DIAGNOSTIC_ASSERT(
+      mPresContext->GetVisibleArea().width != NS_UNCONSTRAINEDSIZE,
+      "width should not be NS_UNCONSTRAINEDSIZE after reflow");
+  MOZ_DIAGNOSTIC_ASSERT(
+      mPresContext->GetVisibleArea().height != NS_UNCONSTRAINEDSIZE,
+      "height should not be NS_UNCONSTRAINEDSIZE after reflow");
 
   postResizeEventIfNeeded();
   return NS_OK;  // XXX this needs to be real. MMP
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/build/nsLayoutStatics.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/build/nsLayoutStatics.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/build/nsLayoutStatics.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/build/nsLayoutStatics.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -359,6 +359,7 @@
   nsCSSKeywords::ReleaseTable();
   nsRepeatService::Shutdown();
   nsStackLayout::Shutdown();
+  nsBox::Shutdown();
 
 #ifdef MOZ_XUL
   nsXULContentUtils::Finish();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/forms/nsButtonFrameRenderer.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/forms/nsButtonFrameRenderer.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/forms/nsButtonFrameRenderer.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/forms/nsButtonFrameRenderer.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -134,11 +134,11 @@
   nsRect shadowRect = nsRect(ToReferenceFrame(), mFrame->GetSize());
   LayoutDeviceRect deviceBox =
       LayoutDeviceRect::FromAppUnits(shadowRect, appUnitsPerDevPixel);
-  wr::LayoutRect deviceBoxRect = wr::ToRoundedLayoutRect(deviceBox);
+  wr::LayoutRect deviceBoxRect = wr::ToLayoutRect(deviceBox);
 
   LayoutDeviceRect clipRect =
       LayoutDeviceRect::FromAppUnits(GetPaintRect(), appUnitsPerDevPixel);
-  wr::LayoutRect deviceClipRect = wr::ToRoundedLayoutRect(clipRect);
+  wr::LayoutRect deviceClipRect = wr::ToLayoutRect(clipRect);
 
   bool hasBorderRadius;
   Unused << nsCSSRendering::HasBoxShadowNativeTheme(mFrame, hasBorderRadius);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/forms/nsFieldSetFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/forms/nsFieldSetFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/forms/nsFieldSetFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/forms/nsFieldSetFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -185,12 +185,12 @@
     if (!legendRect.IsEmpty()) {
       // We need to clip out the part of the border where the legend would go
       auto appUnitsPerDevPixel = frame->PresContext()->AppUnitsPerDevPixel();
-      auto layoutRect = wr::ToRoundedLayoutRect(LayoutDeviceRect::FromAppUnits(
+      auto layoutRect = wr::ToLayoutRect(LayoutDeviceRect::FromAppUnits(
           frame->GetVisualOverflowRectRelativeToSelf() + offset,
           appUnitsPerDevPixel));
 
       wr::ComplexClipRegion region;
-      region.rect = wr::ToRoundedLayoutRect(
+      region.rect = wr::ToLayoutRect(
           LayoutDeviceRect::FromAppUnits(legendRect, appUnitsPerDevPixel));
       region.mode = wr::ClipMode::ClipOut;
       region.radii = wr::EmptyBorderRadius();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/forms/nsListControlFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/forms/nsListControlFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/forms/nsListControlFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/forms/nsListControlFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -556,7 +556,11 @@
     // Looks like we have no options.  Just size us to a single row
     // block size.
     state.SetComputedBSize(blockSizeOfARow);
-    mNumDisplayRows = 1;
+    // mNumDisplayRows is used as the number of options to move for the page
+    // up/down keys. If we're in a content process, we can't calculate
+    // mNumDisplayRows properly, but the maximum number of rows is a lot more
+    // uesful for page up/down than 1.
+    mNumDisplayRows = XRE_IsContentProcess() ? kMaxDropDownRows : 1;
   } else {
     nsComboboxControlFrame* combobox =
         static_cast<nsComboboxControlFrame*>(mComboboxFrame);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/forms/test/mochitest.ini firefox-trunk-71.0~a1~hg20190915r493291/layout/forms/test/mochitest.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/forms/test/mochitest.ini	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/forms/test/mochitest.ini	2019-09-15 11:33:17.000000000 +0000
@@ -72,3 +72,5 @@
 [test_bug1529036.html]
 [test_readonly.html]
 [test_select_key_navigation_bug1498769.html]
+[test_select_collapsed_page_keys.html]
+skip-if = os == 'mac' # select control keyboard behavior is different
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/forms/test/test_select_collapsed_page_keys.html firefox-trunk-71.0~a1~hg20190915r493291/layout/forms/test/test_select_collapsed_page_keys.html
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/forms/test/test_select_collapsed_page_keys.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/forms/test/test_select_collapsed_page_keys.html	2019-09-15 11:33:17.000000000 +0000
@@ -0,0 +1,43 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Test for page up/down in collapsed select (bug 1488828)</title>
+<script src="/tests/SimpleTest/SimpleTest.js"></script>
+<script src="/tests/SimpleTest/EventUtils.js"></script>
+<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
+<script>
+  SimpleTest.waitForExplicitFinish();
+
+  function test() {
+    let select = document.getElementById("select");
+    select.focus();
+    is(select.selectedIndex, 0, "Option 0 initially selected");
+    synthesizeKey("KEY_PageDown", {});
+    ok(select.selectedIndex >= 2, "PageDown skips more than 1 option");
+    ok(select.selectedIndex < 49, "PageDown does not move to the last option");
+    synthesizeKey("KEY_PageUp", {});
+    is(select.selectedIndex, 0, "PageUp skips more than 1 option");
+    SimpleTest.finish();
+  }
+</script>
+</head>
+<body onload="test()">
+<div>
+  <select id="select" size="1">
+    <option selected>0</option>
+  </select>
+  <script>
+    // Add more options so we have 50 in total.
+    let select = document.getElementById("select");
+    for (let i = 1; i <= 49; ++i) {
+      let option = document.createElement("option");
+      option.textContent = i;
+      select.appendChild(option);
+    }
+  </script>
+</div>
+<pre id="test">
+</pre>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/1528771.html firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/1528771.html
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/1528771.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/1528771.html	2019-09-15 11:33:17.000000000 +0000
@@ -0,0 +1,10 @@
+<html>
+<head>
+    <style>
+        * {
+            display: inline-grid;
+            grid-template-columns: repeat(9999, minmax(1%, 25054ex) minmax(1%, 2%) 1px) repeat(auto-fit, minmax(1%, 2%));
+        }
+    </style>
+</head>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/1560349.html firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/1560349.html
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/1560349.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/1560349.html	2019-09-15 11:33:17.000000000 +0000
@@ -0,0 +1,12 @@
+<style>
+    #id_0 {
+        grid-template-rows: [ line_name_37 ] repeat(18022, [ line_name_38 ] 60% [ line_name_39 line_name_40 line_name_41 ] minmax(max-content, 24ex) [ line_name_42 ]) [ line_name_43 ] repeat(auto-fit, [ line_name_44 ] minmax(61%, min-content) [ line_name_45 line_name_46 ]) [ line_name_47 ] minmax(min-content, 25%) [ line_name_48 ];
+    }
+
+    .class_0 {
+        grid-row-end: line_name_19;
+        display: inline-grid;
+    }
+</style>
+<ol class="class_0" id="id_0">
+    <li class="class_0">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/1560397-2.html firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/1560397-2.html
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/1560397-2.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/1560397-2.html	2019-09-15 11:33:17.000000000 +0000
@@ -0,0 +1,25 @@
+<html>
+<head>
+    <style>
+
+        .class_2, .class_3 {
+            display: inline-grid;
+            grid: repeat(3, 6%) repeat(1, minmax(1em, 3%))/repeat(1, auto);
+            grid-row: i;
+            grid-auto-columns: 1px;
+        }
+        .class_2 {
+           grid-column: span 999999;
+           grid-template-columns: subgrid repeat(99999, [a]) repeat(auto-fill,[b]);
+        }
+    </style>
+</head>
+<body>
+<big class="class_3">
+  <em class="class_2">
+    <x style="grid-column:b">A</x>
+    <x style="grid-column:a -1">A</x>
+  </em>
+</big>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/1560397.html firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/1560397.html
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/1560397.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/1560397.html	2019-09-15 11:33:17.000000000 +0000
@@ -0,0 +1,21 @@
+<html>
+<head>
+    <style>
+        BIG, .class_2 {
+            position: fixed;
+            rotate: 4.201792242287117rad z;
+        }
+
+        .class_2, .class_3 {
+            display: inline-grid;
+            grid: repeat(25976, 2vh) repeat(auto-fit, minmax(0, max-content)) repeat(3, 6%) repeat(1, minmax(1em, 3%))/repeat(1, auto);
+            grid-row: i
+        }
+    </style>
+</head>
+<body>
+<big class="class_3">
+    <em class="class_2"></em>
+</big>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/1569639.html firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/1569639.html
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/1569639.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/1569639.html	2019-09-15 11:33:18.000000000 +0000
@@ -0,0 +1,13 @@
+<html>
+<head>
+    <style>
+        #id_0 {
+            display: inline-grid;
+            grid-template-rows: [ l0 ] repeat(58321, [ l1 ] minmax(26571ch, max-content) [ l2 ]) [ l3 ] repeat(auto-fill, [ l4 l5 ] minmax(min-content, 46.15128007109454em) [ l6 ])
+        }
+    </style>
+</head>
+<body>
+    <abbr id="id_0"></abbr>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/crashtests.list firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/crashtests.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/crashtests/crashtests.list	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/crashtests/crashtests.list	2019-09-15 11:33:17.000000000 +0000
@@ -729,6 +729,7 @@
 pref(layout.css.column-span.enabled,true) load 1517297.html
 load chrome://reftest/content/crashtests/layout/generic/crashtests/1520798-1.xul
 load 1520798-2.html
+load 1528771.html
 load 1539656.html
 load 1544060-1.html
 load 1544060-2.html
@@ -736,10 +737,14 @@
 pref(layout.css.grid-template-subgrid-value.enabled,true) load 1553824.html
 pref(layout.css.column-span.enabled,true) load 1554824.html
 load 1555142.html
+load 1560349.html
+load 1560397.html
+load 1560397-2.html
 load 1562105.html
 pref(layout.css.column-span.enabled,true) load 1563131.html
 pref(layout.css.column-span.enabled,true) load 1568001-1.html
 pref(layout.css.column-span.enabled,true) load 1568001-2.html
+load 1569639.html
 pref(layout.css.column-span.enabled,true) load 1571239.html
 load 1571460.html
 pref(layout.css.column-span.enabled,true) load 1571598.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsBulletFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsBulletFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsBulletFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsBulletFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -446,7 +446,6 @@
       aItem->Frame()->PresContext()->AppUnitsPerDevPixel();
   LayoutDeviceRect destRect =
       LayoutDeviceRect::FromAppUnits(mDest, appUnitsPerDevPixel);
-  destRect.Round();
 
   Maybe<SVGImageContext> svgContext;
   gfx::IntSize decodeSize =
@@ -485,7 +484,7 @@
     mozilla::layers::RenderRootStateManager* aManager,
     nsDisplayListBuilder* aDisplayListBuilder) {
   MOZ_ASSERT(IsPathType());
-  wr::LayoutRect dest = wr::ToRoundedLayoutRect(mPathRect);
+  wr::LayoutRect dest = wr::ToLayoutRect(mPathRect);
   auto color = wr::ToColorF(ToDeviceColor(mColor));
   bool isBackfaceVisible = !aItem->BackfaceIsHidden();
   switch (mListStyleType) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsCanvasFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsCanvasFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsCanvasFrame.cpp	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsCanvasFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -372,8 +372,8 @@
   LayoutDeviceRect rect =
       LayoutDeviceRect::FromAppUnits(bgClipRect, appUnitsPerDevPixel);
 
-  wr::LayoutRect roundedRect = wr::ToRoundedLayoutRect(rect);
-  aBuilder.PushRect(roundedRect, roundedRect, !BackfaceIsHidden(),
+  wr::LayoutRect r = wr::ToLayoutRect(rect);
+  aBuilder.PushRect(r, r, !BackfaceIsHidden(),
                     wr::ToColorF(ToDeviceColor(mColor)));
   return true;
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsFrame.cpp	2019-09-15 11:33:18.000000000 +0000
@@ -2309,10 +2309,9 @@
     const StackingContextHelper& aSc,
     mozilla::layers::RenderRootStateManager* aManager,
     nsDisplayListBuilder* aDisplayListBuilder) {
-  wr::LayoutRect bounds =
-      wr::ToRoundedLayoutRect(LayoutDeviceRect::FromAppUnits(
-          nsRect(ToReferenceFrame(), Frame()->GetSize()),
-          mFrame->PresContext()->AppUnitsPerDevPixel()));
+  wr::LayoutRect bounds = wr::ToLayoutRect(LayoutDeviceRect::FromAppUnits(
+      nsRect(ToReferenceFrame(), Frame()->GetSize()),
+      mFrame->PresContext()->AppUnitsPerDevPixel()));
   aBuilder.PushRect(bounds, bounds, !BackfaceIsHidden(),
                     wr::ToColorF(ComputeColor()));
   return true;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsGridContainerFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsGridContainerFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsGridContainerFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsGridContainerFrame.cpp	2019-09-15 11:33:18.000000000 +0000
@@ -204,20 +204,53 @@
                          const LogicalSize& aMax)
       : mMin(aMin), mSize(aSize), mMax(aMax) {}
 
-  void SetDefiniteSizes(LogicalAxis aAxis, WritingMode aWM,
-                        const StyleSize& aMinCoord, const StyleSize& aSizeCoord,
-                        const StyleMaxSize& aMaxCoord) {
+  // This should be used in intrinsic sizing (i.e. when we can't initialize
+  // the sizes directly from ReflowInput values).
+  void InitFromStyle(LogicalAxis aAxis, WritingMode aWM,
+                     const ComputedStyle* aStyle) {
+    const auto& pos = aStyle->StylePosition();
+    const bool borderBoxSizing = pos->mBoxSizing == StyleBoxSizing::Border;
+    nscoord bp = NS_UNCONSTRAINEDSIZE; // a sentinel to calculate it only once
+    auto adjustForBoxSizing =
+        [borderBoxSizing, aWM, aAxis, aStyle, &bp](nscoord aSize) {
+      if (!borderBoxSizing) {
+        return aSize;
+      }
+      if (bp == NS_UNCONSTRAINEDSIZE) {
+        const auto& padding = aStyle->StylePadding()->mPadding;
+        LogicalMargin border(aWM, aStyle->StyleBorder()->GetComputedBorder());
+        // We can use zero percentage basis since this is only called from
+        // intrinsic sizing code.
+        const nscoord percentageBasis = 0;
+        if (aAxis == eLogicalAxisInline) {
+          bp = std::max(padding.GetIStart(aWM).Resolve(percentageBasis), 0) +
+               std::max(padding.GetIEnd(aWM).Resolve(percentageBasis), 0) +
+               border.IStartEnd(aWM);
+        } else {
+          bp = std::max(padding.GetBStart(aWM).Resolve(percentageBasis), 0) +
+               std::max(padding.GetBEnd(aWM).Resolve(percentageBasis), 0) +
+               border.BStartEnd(aWM);
+        }
+      }
+      return std::max(aSize - bp, 0);
+    };
     nscoord& min = mMin.Size(aAxis, aWM);
     nscoord& size = mSize.Size(aAxis, aWM);
     nscoord& max = mMax.Size(aAxis, aWM);
-    if (aMinCoord.ConvertsToLength()) {
-      min = aMinCoord.ToLength();
-    }
-    if (aMaxCoord.ConvertsToLength()) {
-      max = std::max(min, aMaxCoord.ToLength());
-    }
-    if (aSizeCoord.ConvertsToLength()) {
-      size = Clamp(aSizeCoord.ToLength(), min, max);
+    const auto& minCoord = aAxis == eLogicalAxisInline ? pos->MinISize(aWM)
+                                                       : pos->MinBSize(aWM);
+    if (minCoord.ConvertsToLength()) {
+      min = adjustForBoxSizing(minCoord.ToLength());
+    }
+    const auto& maxCoord = aAxis == eLogicalAxisInline ? pos->MaxISize(aWM)
+                                                       : pos->MaxBSize(aWM);
+    if (maxCoord.ConvertsToLength()) {
+      max = std::max(min, adjustForBoxSizing(maxCoord.ToLength()));
+    }
+    const auto& sizeCoord = aAxis == eLogicalAxisInline ? pos->ISize(aWM)
+                                                        : pos->BSize(aWM);
+    if (sizeCoord.ConvertsToLength()) {
+      size = Clamp(adjustForBoxSizing(sizeCoord.ToLength()), min, max);
     }
   }
 
@@ -1241,6 +1274,10 @@
     }
     if (MOZ_UNLIKELY(mExpandedTracks.Length() > kMaxLine - 1)) {
       mExpandedTracks.TruncateLength(kMaxLine - 1);
+      if (mHasRepeatAuto && mRepeatAutoStart > kMaxLine - 1) {
+        // The `repeat(auto-fill/fit)` track is outside the clamped grid.
+        mHasRepeatAuto = false;
+      }
     }
   }
 
@@ -1272,7 +1309,7 @@
   // The difference between mExplicitGridEnd and mSizingFunctions.Length().
   int32_t mRepeatEndDelta;
   // True if there is a specified repeat(auto-fill/fit) track.
-  const bool mHasRepeatAuto;
+  bool mHasRepeatAuto;
   // True if this track (relative to mRepeatAutoStart) is a removed auto-fit.
   // Indexed relative to mExplicitGridOffset + mRepeatAutoStart.
   nsTArray<bool> mRemovedRepeatTracks;
@@ -1322,8 +1359,9 @@
         mIsSameDirection(aIsSameDirection),
         mHasRepeatAuto(aTracks.mHasRepeatAuto) {
     MOZ_ASSERT(mHasRepeatAuto || mRepeatEndDelta == 0);
-    MOZ_ASSERT(mRepeatAutoStart <= mTracks.mExpandedLineNames.Length());
-    MOZ_ASSERT(!mHasRepeatAuto || mTracks.mExpandedLineNames.Length() >= 2);
+    MOZ_ASSERT(!mHasRepeatAuto ||
+               (mTracks.mExpandedLineNames.Length() >= 2 &&
+                mRepeatAutoStart <= mTracks.mExpandedLineNames.Length()));
   }
 
   /**
@@ -3994,16 +4032,12 @@
   // computing them otherwise.
   RepeatTrackSizingInput repeatSizing(state.mWM);
   if (!childGrid->IsColSubgrid() && state.mColFunctions.mHasRepeatAuto) {
-    repeatSizing.SetDefiniteSizes(eLogicalAxisInline, state.mWM,
-                                  state.mGridStyle->MinISize(state.mWM),
-                                  state.mGridStyle->ISize(state.mWM),
-                                  state.mGridStyle->MaxISize(state.mWM));
+    repeatSizing.InitFromStyle(eLogicalAxisInline, state.mWM,
+                               state.mFrame->Style());
   }
   if (!childGrid->IsRowSubgrid() && state.mRowFunctions.mHasRepeatAuto) {
-    repeatSizing.SetDefiniteSizes(eLogicalAxisBlock, state.mWM,
-                                  state.mGridStyle->MinBSize(state.mWM),
-                                  state.mGridStyle->BSize(state.mWM),
-                                  state.mGridStyle->MaxBSize(state.mWM));
+    repeatSizing.InitFromStyle(eLogicalAxisBlock, state.mWM,
+                               state.mFrame->Style());
   }
 
   PlaceGridItems(state, repeatSizing);
@@ -4489,8 +4523,6 @@
     const TrackSizingFunctions& aFunctions,
     const NonNegativeLengthPercentageOrNormal& aGridGap, uint32_t aNumTracks,
     nscoord aContentBoxSize) {
-  MOZ_ASSERT(aNumTracks >=
-             aFunctions.mExplicitGridOffset + aFunctions.NumExplicitTracks());
   mSizes.SetLength(aNumTracks);
   PodZero(mSizes.Elements(), mSizes.Length());
   for (uint32_t i = 0, len = mSizes.Length(); i < len; ++i) {
@@ -7723,19 +7755,15 @@
   // They're only used for auto-repeat so we skip computing them otherwise.
   RepeatTrackSizingInput repeatSizing(state.mWM);
   if (!IsColSubgrid() && state.mColFunctions.mHasRepeatAuto) {
-    repeatSizing.SetDefiniteSizes(eLogicalAxisInline, state.mWM,
-                                  state.mGridStyle->MinISize(state.mWM),
-                                  state.mGridStyle->ISize(state.mWM),
-                                  state.mGridStyle->MaxISize(state.mWM));
+    repeatSizing.InitFromStyle(eLogicalAxisInline, state.mWM,
+                               state.mFrame->Style());
   }
   if (!IsRowSubgrid() && state.mRowFunctions.mHasRepeatAuto &&
       !(state.mGridStyle->mGridAutoFlow & NS_STYLE_GRID_AUTO_FLOW_ROW)) {
     // Only 'grid-auto-flow:column' can create new implicit columns, so that's
     // the only case where our block-size can affect the number of columns.
-    repeatSizing.SetDefiniteSizes(eLogicalAxisBlock, state.mWM,
-                                  state.mGridStyle->MinBSize(state.mWM),
-                                  state.mGridStyle->BSize(state.mWM),
-                                  state.mGridStyle->MaxBSize(state.mWM));
+    repeatSizing.InitFromStyle(eLogicalAxisBlock, state.mWM,
+                               state.mFrame->Style());
   }
 
   Grid grid;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsHTMLCanvasFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsHTMLCanvasFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsHTMLCanvasFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsHTMLCanvasFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -163,7 +163,7 @@
         // parent side, where it will be done when we build the display list for
         // the iframe. That happens in WebRenderCompositableHolder.
 
-        wr::LayoutRect r = wr::ToRoundedLayoutRect(bounds);
+        wr::LayoutRect r = wr::ToLayoutRect(bounds);
         aBuilder.PushIFrame(r, !BackfaceIsHidden(), data->GetPipelineId().ref(),
                             /*ignoreMissingPipelines*/ false);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsImageFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsImageFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsImageFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsImageFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -1569,7 +1569,7 @@
   // Clip to this rect so we don't render outside the inner rect
   LayoutDeviceRect bounds = LayoutDeviceRect::FromAppUnits(
       inner, PresContext()->AppUnitsPerDevPixel());
-  auto wrBounds = wr::ToRoundedLayoutRect(bounds);
+  auto wrBounds = wr::ToLayoutRect(bounds);
 
   // Draw image
   ImgDrawResult result = ImgDrawResult::NOT_READY;
@@ -1609,7 +1609,6 @@
 
       const int32_t factor = PresContext()->AppUnitsPerDevPixel();
       LayoutDeviceRect destRect(LayoutDeviceRect::FromAppUnits(dest, factor));
-      destRect.Round();
 
       Maybe<SVGImageContext> svgContext;
       IntSize decodeSize =
@@ -1641,7 +1640,7 @@
       nsRect rect(iconXPos, inner.y, size, size);
       auto devPxRect = LayoutDeviceRect::FromAppUnits(
           rect, PresContext()->AppUnitsPerDevPixel());
-      auto dest = wr::ToRoundedLayoutRect(devPxRect);
+      auto dest = wr::ToLayoutRect(devPxRect);
 
       auto borderWidths = wr::ToBorderWidths(1.0, 1.0, 1.0, 1.0);
       wr::BorderSide side = {color, wr::BorderStyle::Solid};
@@ -1656,7 +1655,7 @@
                     size / 2 - twoPX);
       devPxRect = LayoutDeviceRect::FromAppUnits(
           rect, PresContext()->AppUnitsPerDevPixel());
-      dest = wr::ToRoundedLayoutRect(devPxRect);
+      dest = wr::ToLayoutRect(devPxRect);
 
       aBuilder.PushRoundedRect(dest, wrBounds, isBackfaceVisible, color);
     }
@@ -1891,7 +1890,6 @@
   const int32_t factor = mFrame->PresContext()->AppUnitsPerDevPixel();
   LayoutDeviceRect destRect(
       LayoutDeviceRect::FromAppUnits(GetDestRect(), factor));
-  destRect.Round();
 
   Maybe<SVGImageContext> svgContext;
   IntSize decodeSize = nsLayoutUtils::ComputeImageContainerDrawingParameters(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsSubDocumentFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsSubDocumentFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/nsSubDocumentFrame.cpp	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/nsSubDocumentFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -1505,8 +1505,8 @@
       mFrame->PresContext()->AppUnitsPerDevPixel());
   rect += mOffset;
 
-  aBuilder.PushIFrame(mozilla::wr::ToRoundedLayoutRect(rect),
-                      !BackfaceIsHidden(), mozilla::wr::AsPipelineId(mLayersId),
+  aBuilder.PushIFrame(mozilla::wr::ToLayoutRect(rect), !BackfaceIsHidden(),
+                      mozilla::wr::AsPipelineId(mLayersId),
                       /*ignoreMissingPipelines*/ true);
 
   return true;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/ReflowInput.h firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/ReflowInput.h
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/ReflowInput.h	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/ReflowInput.h	2019-09-15 11:33:17.000000000 +0000
@@ -250,7 +250,7 @@
 
     // If this flag is set, the BSize of this frame should be considered
     // indefinite for the purposes of percent resolution on child frames (we
-    // should behave as if ComputedBSize() were NS_INTRINSIC_ISIZE when doing
+    // should behave as if ComputedBSize() were NS_UNCONSTRAINEDSIZE when doing
     // percent resolution against this.ComputedBSize()).  For example: flex
     // items may have their ComputedBSize() resolved ahead-of-time by their
     // flex container, and yet their BSize might have to be considered
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/ScrollAnchorContainer.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/ScrollAnchorContainer.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/ScrollAnchorContainer.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/ScrollAnchorContainer.cpp	2019-09-15 11:33:18.000000000 +0000
@@ -441,6 +441,13 @@
     return ExamineResult::Exclude;
   }
 
+  const bool isReplaced = aFrame->IsFrameOfType(nsIFrame::eReplaced);
+
+  const bool isNonReplacedInline =
+      aFrame->StyleDisplay()->IsInlineInsideStyle() && !isReplaced;
+
+  const bool isAnonBox = aFrame->Style()->IsAnonBox();
+
   // See if this frame could have its own anchor node. We could check
   // IsScrollFrame(), but that would miss nsListControlFrame which is not a
   // scroll frame, but still inherits from nsHTMLScrollFrame.
@@ -450,31 +457,24 @@
   // it's not clear how an anchor adjustment should apply to multiple scrollable
   // frames. Blink allows this to happen, but they're not sure why [1].
   //
-  // We also don't allow scroll anchors to be selected inside of SVG as it uses
-  // a different layout model than CSS, and the specification doesn't say it
-  // should apply.
+  // We also don't allow scroll anchors to be selected inside of replaced
+  // elements (like <img>, <video>, <svg>...) as they behave atomically. SVG
+  // uses a different layout model than CSS, and the specification doesn't say
+  // it should apply anyway.
   //
   // [1] https://github.com/w3c/csswg-drafts/issues/3477
-  bool canDescend = !scrollable && !aFrame->IsSVGOuterSVGFrame();
+  const bool canDescend = !scrollable && !isReplaced;
 
-  // Check what kind of frame this is
-  bool isBlockOutside = aFrame->IsBlockOutside();
-  bool isAnonBox = aFrame->Style()->IsAnonBox() && !isText;
-  bool isInlineOutside = aFrame->IsInlineOutside() && !isText;
-
-  // If the frame is anonymous or inline-outside, search its descendants for a
-  // scroll anchor.
-  if ((isAnonBox || isInlineOutside) && canDescend) {
+  // Non-replaced inline boxes (including ruby frames) and anon boxes are not
+  // acceptable anchors, so we descend if possible, or otherwise exclude them
+  // altogether.
+  if (!isText && (isNonReplacedInline || isAnonBox)) {
     ANCHOR_LOG(
-        "\t\tSearching descendants of anon or inline box (a=%d, i=%d).\n",
-        isAnonBox, isInlineOutside);
-    return ExamineResult::PassThrough;
-  }
-
-  // If the frame is not block-outside or a text node then exclude it.
-  if (!isBlockOutside && !isText) {
-    ANCHOR_LOG("\t\tExcluding non block-outside or text node (b=%d, t=%d).\n",
-               isBlockOutside, isText);
+        "\t\tSearching descendants of anon or non-replaced inline box (a=%d, i=%d).\n",
+        isAnonBox, isNonReplacedInline);
+    if (canDescend) {
+      return ExamineResult::PassThrough;
+    }
     return ExamineResult::Exclude;
   }
 
@@ -494,15 +494,14 @@
     return ExamineResult::Exclude;
   }
 
-  // At this point, if canDescend is true, we should only have visible
-  // non-anonymous frames that are either:
-  //   1. block-outside
-  //   2. text nodes
-  //
-  // It's not clear what the scroll anchoring bounding rect of elements that are
-  // block-outside should be when they are fragmented. For text nodes that are
-  // fragmented, it's specified that we need to consider the union of its line
-  // boxes.
+  // It's not clear what the scroll anchoring bounding rect is, for elements
+  // fragmented in the block direction (e.g. across column or page breaks).
+  //
+  // Inline-fragmented elements other than text shouldn't get here because of
+  // the isNonReplacedInline check.
+  //
+  // For text nodes that are fragmented, it's specified that we need to consider
+  // the union of its line boxes.
   //
   // So for text nodes we handle them by including the union of line boxes in
   // the bounding rect of the primary frame, and not selecting any
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/TextDrawTarget.h firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/TextDrawTarget.h
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/generic/TextDrawTarget.h	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/generic/TextDrawTarget.h	2019-09-15 11:33:17.000000000 +0000
@@ -84,7 +84,7 @@
     LayoutDeviceRect layoutBoundsRect =
         LayoutDeviceRect::FromAppUnits(aBounds, appUnitsPerDevPixel);
     LayoutDeviceRect layoutClipRect = layoutBoundsRect;
-    mBoundsRect = wr::ToRoundedLayoutRect(layoutBoundsRect);
+    mBoundsRect = wr::ToLayoutRect(layoutBoundsRect);
 
     // Add 1 pixel of dirty area around clip rect to allow us to paint
     // antialiased pixels beyond the measured text extents.
@@ -275,7 +275,7 @@
     }
 
     wr::Line decoration;
-    decoration.bounds = wr::ToRoundedLayoutRect(LayoutDeviceRect(pos, size));
+    decoration.bounds = wr::ToLayoutRect(LayoutDeviceRect(pos, size));
     decoration.wavyLineThickness = 0;  // dummy value, unused
     decoration.color = wr::ToColorF(aColor);
     decoration.orientation = aVertical ? wr::LineOrientation::Vertical
@@ -310,7 +310,7 @@
     wr::Line decoration;
 
     decoration.bounds =
-        wr::ToRoundedLayoutRect(LayoutDeviceRect::FromUnknownRect(aBounds));
+        wr::ToLayoutRect(LayoutDeviceRect::FromUnknownRect(aBounds));
     decoration.wavyLineThickness = aThickness;
     decoration.color = wr::ToColorF(aColor);
     decoration.orientation = aVertical ? wr::LineOrientation::Vertical
@@ -347,7 +347,7 @@
 
  private:
   wr::LayoutRect ClipRect() {
-    return wr::ToRoundedLayoutRect(mClipStack.LastElement());
+    return wr::ToLayoutRect(mClipStack.LastElement());
   }
   LayoutDeviceRect GeckoClipRect() { return mClipStack.LastElement(); }
   // Whether anything unsupported was encountered. This will result in this
@@ -463,8 +463,7 @@
     if (!aRect.Intersects(GeckoClipRect().ToUnknownRect())) {
       return;
     }
-    auto rect =
-        wr::ToRoundedLayoutRect(LayoutDeviceRect::FromUnknownRect(aRect));
+    auto rect = wr::ToLayoutRect(LayoutDeviceRect::FromUnknownRect(aRect));
     auto color =
         wr::ToColorF(static_cast<const ColorPattern&>(aPattern).mColor);
     mBuilder.PushRect(rect, ClipRect(), mBackfaceVisible, color);
@@ -491,7 +490,7 @@
     if (!rect.Intersects(GeckoClipRect())) {
       return;
     }
-    wr::LayoutRect bounds = wr::ToRoundedLayoutRect(rect);
+    wr::LayoutRect bounds = wr::ToLayoutRect(rect);
     mBuilder.PushBorder(bounds, ClipRect(), true, widths,
                         Range<const wr::BorderSide>(sides, 4), radius);
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/mathml.css firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/mathml.css
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/mathml.css	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/mathml.css	2019-09-15 11:33:17.000000000 +0000
@@ -72,7 +72,7 @@
 /* attributes common to all tags                                          */
 /**************************************************************************/
 
-/* These attributes are mapped to style in nsMathMLElement.cpp:
+/* These attributes are mapped to style in MathMLElement.cpp:
 
    - background -> background                             (deprecated)
    - color -> color                                       (deprecated)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLContainerFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLContainerFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLContainerFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLContainerFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -19,7 +19,7 @@
 #include "nsDisplayList.h"
 #include "nsIScriptError.h"
 #include "nsContentUtils.h"
-#include "nsMathMLElement.h"
+#include "mozilla/dom/MathMLElement.h"
 
 using namespace mozilla;
 using namespace mozilla::gfx;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -13,7 +13,7 @@
 #include "nsNameSpaceManager.h"
 #include "nsMathMLChar.h"
 #include "nsCSSPseudoElements.h"
-#include "nsMathMLElement.h"
+#include "mozilla/dom/MathMLElement.h"
 #include "gfxMathTable.h"
 #include "nsPresContextInlines.h"
 
@@ -233,8 +233,8 @@
                                       float aFontSizeInflation) {
   nsCSSValue cssValue;
 
-  if (!nsMathMLElement::ParseNumericValue(aString, cssValue, aFlags,
-                                          aPresContext->Document())) {
+  if (!dom::MathMLElement::ParseNumericValue(aString, cssValue, aFlags,
+                                             aPresContext->Document())) {
     // Invalid attribute value. aLengthValue remains unchanged, so the default
     // length value is used.
     return;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmfracFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmfracFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmfracFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmfracFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -15,7 +15,7 @@
 #include "nsPresContext.h"
 #include "nsDisplayList.h"
 #include "gfxContext.h"
-#include "nsMathMLElement.h"
+#include "mozilla/dom/MathMLElement.h"
 #include <algorithm>
 #include "gfxMathTable.h"
 
@@ -108,7 +108,7 @@
       // length value
       lineThickness = defaultThickness;
       ParseNumericValue(aThicknessAttribute, &lineThickness,
-                        nsMathMLElement::PARSE_ALLOW_UNITLESS, aPresContext,
+                        dom::MathMLElement::PARSE_ALLOW_UNITLESS, aPresContext,
                         aComputedStyle, aFontSizeInflation);
     } else {
       bool isDeprecatedLineThicknessValue = true;
@@ -135,8 +135,8 @@
         isDeprecatedLineThicknessValue = false;
         lineThickness = defaultThickness;
         ParseNumericValue(aThicknessAttribute, &lineThickness,
-                          nsMathMLElement::PARSE_ALLOW_UNITLESS, aPresContext,
-                          aComputedStyle, aFontSizeInflation);
+                          dom::MathMLElement::PARSE_ALLOW_UNITLESS,
+                          aPresContext, aComputedStyle, aFontSizeInflation);
       }
       if (isDeprecatedLineThicknessValue) {
         mContent->OwnerDoc()->WarnOnceAbout(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmoFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmoFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmoFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmoFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -10,7 +10,7 @@
 #include "nsPresContext.h"
 #include "nsContentUtils.h"
 #include "nsFrameSelection.h"
-#include "nsMathMLElement.h"
+#include "mozilla/dom/MathMLElement.h"
 #include <algorithm>
 
 using namespace mozilla;
@@ -373,8 +373,8 @@
   mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::lspace_, value);
   if (!value.IsEmpty()) {
     nsCSSValue cssValue;
-    if (nsMathMLElement::ParseNumericValue(value, cssValue, 0,
-                                           mContent->OwnerDoc())) {
+    if (dom::MathMLElement::ParseNumericValue(value, cssValue, 0,
+                                              mContent->OwnerDoc())) {
       if ((eCSSUnit_Number == cssValue.GetUnit()) && !cssValue.GetFloatValue())
         leadingSpace = 0;
       else if (cssValue.IsLengthUnit())
@@ -400,8 +400,8 @@
   mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::rspace_, value);
   if (!value.IsEmpty()) {
     nsCSSValue cssValue;
-    if (nsMathMLElement::ParseNumericValue(value, cssValue, 0,
-                                           mContent->OwnerDoc())) {
+    if (dom::MathMLElement::ParseNumericValue(value, cssValue, 0,
+                                              mContent->OwnerDoc())) {
       if ((eCSSUnit_Number == cssValue.GetUnit()) && !cssValue.GetFloatValue())
         trailingSpace = 0;
       else if (cssValue.IsLengthUnit())
@@ -484,8 +484,8 @@
   mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::minsize_, value);
   if (!value.IsEmpty()) {
     nsCSSValue cssValue;
-    if (nsMathMLElement::ParseNumericValue(
-            value, cssValue, nsMathMLElement::PARSE_ALLOW_UNITLESS,
+    if (dom::MathMLElement::ParseNumericValue(
+            value, cssValue, dom::MathMLElement::PARSE_ALLOW_UNITLESS,
             mContent->OwnerDoc())) {
       nsCSSUnit unit = cssValue.GetUnit();
       if (eCSSUnit_Number == unit)
@@ -516,8 +516,8 @@
   mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::maxsize_, value);
   if (!value.IsEmpty()) {
     nsCSSValue cssValue;
-    if (nsMathMLElement::ParseNumericValue(
-            value, cssValue, nsMathMLElement::PARSE_ALLOW_UNITLESS,
+    if (dom::MathMLElement::ParseNumericValue(
+            value, cssValue, dom::MathMLElement::PARSE_ALLOW_UNITLESS,
             mContent->OwnerDoc())) {
       nsCSSUnit unit = cssValue.GetUnit();
       if (eCSSUnit_Number == unit)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmpaddedFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmpaddedFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmpaddedFrame.cpp	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmpaddedFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsMathMLmpaddedFrame.h"
-#include "nsMathMLElement.h"
+#include "mozilla/dom/MathMLElement.h"
 #include "mozilla/gfx/2D.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/TextUtils.h"
@@ -207,8 +207,8 @@
   else if (!gotPercent) {  // percentage can only apply to a pseudo-unit
 
     // see if the unit is a named-space
-    if (nsMathMLElement::ParseNamedSpaceValue(
-            unit, aCSSValue, nsMathMLElement::PARSE_ALLOW_NEGATIVE,
+    if (dom::MathMLElement::ParseNamedSpaceValue(
+            unit, aCSSValue, dom::MathMLElement::PARSE_ALLOW_NEGATIVE,
             *mContent->OwnerDoc())) {
       // re-scale properly, and we know that the unit of the named-space is 'em'
       floatValue *= aCSSValue.GetFloatValue();
@@ -221,8 +221,8 @@
     // We are not supposed to have a unitless, percent, negative or namedspace
     // value here.
     number.Append(unit);  // leave the sign out if it was there
-    if (nsMathMLElement::ParseNumericValue(
-            number, aCSSValue, nsMathMLElement::PARSE_SUPPRESS_WARNINGS,
+    if (dom::MathMLElement::ParseNumericValue(
+            number, aCSSValue, dom::MathMLElement::PARSE_SUPPRESS_WARNINGS,
             nullptr))
       return true;
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmspaceFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmspaceFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmspaceFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmspaceFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -5,7 +5,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsMathMLmspaceFrame.h"
-#include "nsMathMLElement.h"
+#include "mozilla/dom/MathMLElement.h"
 #include "mozilla/PresShell.h"
 #include "mozilla/gfx/2D.h"
 #include <algorithm>
@@ -45,7 +45,7 @@
   mWidth = 0;
   mContent->AsElement()->GetAttr(kNameSpaceID_None, nsGkAtoms::width, value);
   if (!value.IsEmpty()) {
-    ParseNumericValue(value, &mWidth, nsMathMLElement::PARSE_ALLOW_NEGATIVE,
+    ParseNumericValue(value, &mWidth, dom::MathMLElement::PARSE_ALLOW_NEGATIVE,
                       aPresContext, mComputedStyle, fontSizeInflation);
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmtableFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmtableFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmtableFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmtableFrame.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -10,7 +10,7 @@
 #include "nsStyleConsts.h"
 #include "nsNameSpaceManager.h"
 #include "nsCSSRendering.h"
-#include "nsMathMLElement.h"
+#include "mozilla/dom/MathMLElement.h"
 
 #include "nsTArray.h"
 #include "nsTableFrame.h"
@@ -454,7 +454,7 @@
         newValue = aDefaultValue0;
       }
       nsMathMLFrame::ParseNumericValue(
-          valueString, &newValue, nsMathMLElement::PARSE_ALLOW_UNITLESS,
+          valueString, &newValue, dom::MathMLElement::PARSE_ALLOW_UNITLESS,
           presContext, computedStyle, aFontSizeInflation);
       aSpacingArray.AppendElement(newValue);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmunderoverFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmunderoverFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/mathml/nsMathMLmunderoverFrame.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/mathml/nsMathMLmunderoverFrame.cpp	2019-09-15 11:33:18.000000000 +0000
@@ -7,7 +7,7 @@
 #include "nsMathMLmunderoverFrame.h"
 #include "nsPresContext.h"
 #include "nsMathMLmmultiscriptsFrame.h"
-#include "nsMathMLElement.h"
+#include "mozilla/dom/MathMLElement.h"
 #include <algorithm>
 #include "gfxContext.h"
 #include "gfxMathTable.h"
@@ -107,7 +107,8 @@
     return;
   }
 
-  auto element = static_cast<nsMathMLElement*>(child->GetContent());
+  // XXXfredw: Use MathMLElement::fromNode.
+  auto element = static_cast<dom::MathMLElement*>(child->GetContent());
   if (element->GetIncrementScriptLevel() == aIncrement) {
     return;
   }
@@ -142,7 +143,8 @@
       continue;
     }
 
-    auto element = static_cast<nsMathMLElement*>(child->GetContent());
+    // XXXfredw: Use MathMLElement::fromNode.
+    auto element = static_cast<dom::MathMLElement*>(child->GetContent());
     element->SetIncrementScriptLevel(command.mDoIncrement, true);
   }
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/painting/nsCSSRenderingBorders.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/painting/nsCSSRenderingBorders.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/painting/nsCSSRenderingBorders.cpp	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/painting/nsCSSRenderingBorders.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -3328,7 +3328,7 @@
     wr::IpcResourceUpdateQueue& aResources,
     const layers::StackingContextHelper& aSc) {
   LayoutDeviceRect outerRect = LayoutDeviceRect::FromUnknownRect(mOuterRect);
-  wr::LayoutRect roundedRect = wr::ToRoundedLayoutRect(outerRect);
+  wr::LayoutRect roundedRect = wr::ToLayoutRect(outerRect);
   wr::LayoutRect clipRect = roundedRect;
   wr::BorderSide side[4];
   NS_FOR_CSS_SIDES(i) {
@@ -3345,7 +3345,7 @@
   if (mLocalClip) {
     LayoutDeviceRect localClip =
         LayoutDeviceRect::FromUnknownRect(mLocalClip.value());
-    clipRect = wr::ToRoundedLayoutRect(localClip.Intersect(outerRect));
+    clipRect = wr::ToLayoutRect(localClip.Intersect(outerRect));
   }
 
   Range<const wr::BorderSide> wrsides(side, 4);
@@ -3593,7 +3593,7 @@
   if (!mClip.IsEmpty()) {
     LayoutDeviceRect clipRect =
         LayoutDeviceRect::FromAppUnits(mClip, appUnitsPerDevPixel);
-    clip = wr::ToRoundedLayoutRect(clipRect);
+    clip = wr::ToLayoutRect(clipRect);
   }
 
   ImgDrawResult drawResult = ImgDrawResult::SUCCESS;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/painting/nsDisplayList.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/painting/nsDisplayList.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/painting/nsDisplayList.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/painting/nsDisplayList.cpp	2019-09-15 11:33:18.000000000 +0000
@@ -3866,16 +3866,16 @@
         LayoutDeviceRect renderRootRect =
             aDisplayListBuilder->GetRenderRootRect(renderRoot);
         wr::LayoutRect intersection =
-            wr::ToRoundedLayoutRect(bounds.Intersect(renderRootRect));
+            wr::ToLayoutRect(bounds.Intersect(renderRootRect));
         aBuilder.SubBuilder(renderRoot)
             .PushRect(intersection, intersection, !BackfaceIsHidden(),
                       wr::ToColorF(ToDeviceColor(mColor)));
       }
     }
   } else {
-    wr::LayoutRect roundedRect = wr::ToRoundedLayoutRect(bounds);
+    wr::LayoutRect r = wr::ToLayoutRect(bounds);
 
-    aBuilder.PushRect(roundedRect, roundedRect, !BackfaceIsHidden(),
+    aBuilder.PushRect(r, r, !BackfaceIsHidden(),
                       wr::ToColorF(ToDeviceColor(mColor)));
   }
 
@@ -3915,8 +3915,8 @@
     nsRect rect = iter.Get();
     LayoutDeviceRect layerRects = LayoutDeviceRect::FromAppUnits(
         rect, mFrame->PresContext()->AppUnitsPerDevPixel());
-    wr::LayoutRect roundedRect = wr::ToRoundedLayoutRect(layerRects);
-    aBuilder.PushRect(roundedRect, roundedRect, !BackfaceIsHidden(),
+    wr::LayoutRect r = wr::ToLayoutRect(layerRects);
+    aBuilder.PushRect(r, r, !BackfaceIsHidden(),
                       wr::ToColorF(ToDeviceColor(mColor)));
   }
 
@@ -5181,9 +5181,9 @@
 
   LayoutDeviceRect bounds = LayoutDeviceRect::FromAppUnits(
       mBackgroundRect, mFrame->PresContext()->AppUnitsPerDevPixel());
-  wr::LayoutRect roundedRect = wr::ToRoundedLayoutRect(bounds);
+  wr::LayoutRect r = wr::ToLayoutRect(bounds);
 
-  aBuilder.PushRect(roundedRect, roundedRect, !BackfaceIsHidden(),
+  aBuilder.PushRect(r, r, !BackfaceIsHidden(),
                     wr::ToColorF(ToDeviceColor(mColor)));
 
   return true;
@@ -5366,7 +5366,7 @@
       nsRect(ToReferenceFrame(), mFrame->GetSize()),
       mFrame->PresContext()->AppUnitsPerDevPixel());
 
-  aBuilder.PushClearRect(wr::ToRoundedLayoutRect(bounds));
+  aBuilder.PushClearRect(wr::ToLayoutRect(bounds));
 
   return true;
 }
@@ -5539,7 +5539,7 @@
   const LayoutDeviceRect devRect =
       LayoutDeviceRect::FromAppUnits(HitTestArea(), mAppUnitsPerDevPixel);
 
-  const wr::LayoutRect rect = wr::ToRoundedLayoutRect(devRect);
+  const wr::LayoutRect rect = wr::ToLayoutRect(devRect);
 
   aBuilder.PushHitTest(rect, rect, !BackfaceIsHidden());
   aBuilder.ClearHitTestInfo();
@@ -5611,8 +5611,8 @@
   LayoutDeviceRect devHookRect = LayoutDeviceRect::FromAppUnits(
       hookRect + ToReferenceFrame(), appUnitsPerDevPixel);
 
-  wr::LayoutRect caret = wr::ToRoundedLayoutRect(devCaretRect);
-  wr::LayoutRect hook = wr::ToRoundedLayoutRect(devHookRect);
+  wr::LayoutRect caret = wr::ToLayoutRect(devCaretRect);
+  wr::LayoutRect hook = wr::ToLayoutRect(devHookRect);
 
   // Note, WR will pixel snap anything that is layout aligned.
   aBuilder.PushRect(caret, caret, !BackfaceIsHidden(), wr::ToColorF(color));
@@ -5886,8 +5886,8 @@
 
       LayoutDeviceRect deviceBox =
           LayoutDeviceRect::FromAppUnits(shadowRect, appUnitsPerDevPixel);
-      wr::LayoutRect deviceBoxRect = wr::ToRoundedLayoutRect(deviceBox);
-      wr::LayoutRect deviceClipRect = wr::ToRoundedLayoutRect(clipRect);
+      wr::LayoutRect deviceBoxRect = wr::ToLayoutRect(deviceBox);
+      wr::LayoutRect deviceClipRect = wr::ToLayoutRect(clipRect);
 
       LayoutDeviceSize zeroSize;
       wr::BorderRadius borderRadius =
@@ -6015,7 +6015,7 @@
       // Now translate everything to device pixels.
       LayoutDeviceRect deviceBoxRect =
           LayoutDeviceRect::FromAppUnits(shadowRect, appUnitsPerDevPixel);
-      wr::LayoutRect deviceClipRect = wr::ToRoundedLayoutRect(clipRect);
+      wr::LayoutRect deviceClipRect = wr::ToLayoutRect(clipRect);
       Color shadowColor =
           nsCSSRendering::GetShadowColor(shadow.base, aFrame, 1.0);
 
@@ -7736,7 +7736,7 @@
         NSAppUnitsToFloatPixels(appliedOffset.x, auPerDevPixel),
         NSAppUnitsToFloatPixels(appliedOffset.y, auPerDevPixel)};
     wr::WrSpatialId spatialId = aBuilder.DefineStickyFrame(
-        wr::ToRoundedLayoutRect(bounds), topMargin.ptrOr(nullptr),
+        wr::ToLayoutRect(bounds), topMargin.ptrOr(nullptr),
         rightMargin.ptrOr(nullptr), bottomMargin.ptrOr(nullptr),
         leftMargin.ptrOr(nullptr), vBounds, hBounds, applied);
 
@@ -10031,7 +10031,7 @@
             wr::ToComplexClipRegion(insetRect, radii, appUnitsPerDevPixel));
       }
 
-      rect = wr::ToRoundedLayoutRect(
+      rect = wr::ToLayoutRect(
           LayoutDeviceRect::FromAppUnits(insetRect, appUnitsPerDevPixel));
       break;
     }
@@ -10060,7 +10060,7 @@
       clipRegions.AppendElement(wr::ToComplexClipRegion(
           ellipseRect, ellipseRadii, appUnitsPerDevPixel));
 
-      rect = wr::ToRoundedLayoutRect(
+      rect = wr::ToLayoutRect(
           LayoutDeviceRect::FromAppUnits(ellipseRect, appUnitsPerDevPixel));
       break;
     }
@@ -10099,7 +10099,7 @@
   }
 
   wr::WrClipId clipId = aBuilder.DefineClip(
-      Nothing(), wr::ToRoundedLayoutRect(aBounds), nullptr, mask.ptr());
+      Nothing(), wr::ToLayoutRect(aBounds), nullptr, mask.ptr());
 
   return Some(MakePair(clipId, HandleOpacity::No));
 }
@@ -10512,7 +10512,7 @@
     auto devPxRect = LayoutDeviceRect::FromAppUnits(
         filterClip.value() + ToReferenceFrame(), auPerDevPixel);
     wr::WrClipId clipId =
-        aBuilder.DefineClip(Nothing(), wr::ToRoundedLayoutRect(devPxRect));
+        aBuilder.DefineClip(Nothing(), wr::ToLayoutRect(devPxRect));
     clip = wr::WrStackingContextClip::ClipId(clipId);
   } else {
     clip = wr::WrStackingContextClip::ClipChain(aBuilder.CurrentClipChainId());
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/painting/nsImageRenderer.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/painting/nsImageRenderer.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/painting/nsImageRenderer.cpp	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/painting/nsImageRenderer.cpp	2019-09-15 11:33:17.000000000 +0000
@@ -603,7 +603,6 @@
       LayoutDeviceRect destRect =
           LayoutDeviceRect::FromAppUnits(aDest, appUnitsPerDevPixel);
       auto stretchSize = wr::ToLayoutSize(destRect.Size());
-      destRect.Round();
 
       gfx::IntSize decodeSize =
           nsLayoutUtils::ComputeImageContainerDrawingParameters(
@@ -630,47 +629,47 @@
         break;
       }
 
-      nsPoint firstTilePos = nsLayoutUtils::GetBackgroundFirstTilePos(
-          aDest.TopLeft(), aFill.TopLeft(), aRepeatSize);
-      LayoutDeviceRect fillRect = LayoutDeviceRect::FromAppUnits(
-          nsRect(firstTilePos.x, firstTilePos.y, aFill.XMost() - firstTilePos.x,
-                 aFill.YMost() - firstTilePos.y),
-          appUnitsPerDevPixel);
-      wr::LayoutRect fill = wr::ToRoundedLayoutRect(fillRect);
-
-      wr::LayoutRect roundedDest = wr::ToLayoutRect(destRect);
-
-      // WebRender special cases situations where stretchSize == fillSize to
-      // infer that it shouldn't use repeat sampling. This makes sure
-      // we hit those special cases when not repeating.
-
-      switch (mExtendMode) {
-        case ExtendMode::CLAMP:
-          fill = roundedDest;
-          stretchSize = roundedDest.size;
-          break;
-        case ExtendMode::REPEAT_Y:
-          fill.origin.x = roundedDest.origin.x;
-          fill.size.width = roundedDest.size.width;
-          stretchSize.width = roundedDest.size.width;
-          break;
-        case ExtendMode::REPEAT_X:
-          fill.origin.y = roundedDest.origin.y;
-          fill.size.height = roundedDest.size.height;
-          stretchSize.height = roundedDest.size.height;
-          break;
-        default:
-          break;
-      }
+      wr::LayoutRect dest = wr::ToLayoutRect(destRect);
 
-      wr::LayoutRect clip = wr::ToRoundedLayoutRect(
+      wr::LayoutRect clip = wr::ToLayoutRect(
           LayoutDeviceRect::FromAppUnits(aFill, appUnitsPerDevPixel));
 
-      LayoutDeviceSize gapSize = LayoutDeviceSize::FromAppUnits(
-          aRepeatSize - aDest.Size(), appUnitsPerDevPixel);
-
-      aBuilder.PushImage(fill, clip, !aItem->BackfaceIsHidden(), stretchSize,
-                         wr::ToLayoutSize(gapSize), rendering, key.value());
+      if (mExtendMode == ExtendMode::CLAMP) {
+        // The image is not repeating. Just push as a regular image.
+        aBuilder.PushImage(dest, clip, !aItem->BackfaceIsHidden(), rendering,
+                           key.value());
+      } else {
+        nsPoint firstTilePos = nsLayoutUtils::GetBackgroundFirstTilePos(
+            aDest.TopLeft(), aFill.TopLeft(), aRepeatSize);
+        LayoutDeviceRect fillRect = LayoutDeviceRect::FromAppUnits(
+            nsRect(firstTilePos.x, firstTilePos.y,
+                   aFill.XMost() - firstTilePos.x,
+                   aFill.YMost() - firstTilePos.y),
+            appUnitsPerDevPixel);
+        wr::LayoutRect fill = wr::ToLayoutRect(fillRect);
+
+        switch (mExtendMode) {
+          case ExtendMode::REPEAT_Y:
+            fill.origin.x = dest.origin.x;
+            fill.size.width = dest.size.width;
+            stretchSize.width = dest.size.width;
+            break;
+          case ExtendMode::REPEAT_X:
+            fill.origin.y = dest.origin.y;
+            fill.size.height = dest.size.height;
+            stretchSize.height = dest.size.height;
+            break;
+          default:
+            break;
+        }
+
+        LayoutDeviceSize gapSize = LayoutDeviceSize::FromAppUnits(
+            aRepeatSize - aDest.Size(), appUnitsPerDevPixel);
+
+        aBuilder.PushRepeatingImage(fill, clip, !aItem->BackfaceIsHidden(),
+                                    stretchSize, wr::ToLayoutSize(gapSize),
+                                    rendering, key.value());
+      }
       break;
     }
     default:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/async-scrolling/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/async-scrolling/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/async-scrolling/reftest.list	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/async-scrolling/reftest.list	2019-09-15 11:33:18.000000000 +0000
@@ -5,7 +5,7 @@
 skip-if(!asyncPan) == bg-fixed-child.html bg-fixed-child-ref.html
 skip-if(!asyncPan) == bg-fixed-child-clip-1.html bg-fixed-child-clip-ref.html
 skip-if(!asyncPan) == bg-fixed-child-clip-2.html bg-fixed-child-clip-ref.html
-fuzzy(0-1,0-246) fuzzy-if(skiaContent,0-2,0-170) fuzzy-if(browserIsRemote&&d2d,0-59,0-187) fuzzy-if(webrender,41-41,166-168) skip-if(!asyncPan) == bg-fixed-child-mask.html bg-fixed-child-mask-ref.html
+fuzzy(0-1,0-246) fuzzy-if(skiaContent,0-2,0-170) fuzzy-if(browserIsRemote&&d2d,0-59,0-187) fuzzy-if(webrender,41-41,166-176) skip-if(!asyncPan) == bg-fixed-child-mask.html bg-fixed-child-mask-ref.html
 skip-if(!asyncPan) == bg-fixed-in-opacity.html bg-fixed-in-opacity-ref.html
 # Passing the test below without WebRender would require implementing CSS filters in the Gecko compositor.
 fails-if(!webrender) skip-if(!asyncPan) fuzzy-if(webrender&&gtkWidget,0-1,0-87) fuzzy-if(webrender&&!gtkWidget,0-1,0-3951) == bg-fixed-in-css-filter.html bg-fixed-in-css-filter-ref.html # bug 1454794 for webrender fuzziness
@@ -24,7 +24,7 @@
 skip-if(!asyncPan) == position-fixed-cover-1.html position-fixed-cover-1-ref.html
 skip-if(!asyncPan) == position-fixed-cover-2.html position-fixed-cover-2-ref.html
 skip-if(!asyncPan) == position-fixed-cover-3.html position-fixed-cover-3-ref.html
-fuzzy-if(Android,0-5,0-4) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html
+fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&&gtkWidget,60-60,14-14) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) == position-fixed-transformed-1.html position-fixed-transformed-1-ref.html
 skip-if(!asyncPan) == split-layers-1.html split-layers-1-ref.html
 skip-if(!asyncPan) == split-layers-multi-scrolling-1.html split-layers-multi-scrolling-1-ref.html
 fuzzy-if(skiaContent,0-2,0-240000) fuzzy-if(browserIsRemote&&!skiaContent&&(cocoaWidget||winWidget),0-1,0-240000) skip-if(!asyncPan) == split-opacity-layers-1.html split-opacity-layers-1-ref.html
@@ -49,33 +49,33 @@
 fuzzy(0-1,0-60000) skip-if(!asyncPan) == group-opacity-surface-size-1.html group-opacity-surface-size-1-ref.html
 fuzzy-if(Android,0-1,0-197) fuzzy-if(webrender,0-1,0-1) skip-if(!asyncPan) == position-sticky-transformed.html position-sticky-transformed-ref.html
 skip-if(!asyncPan) == offscreen-prerendered-active-opacity.html offscreen-prerendered-active-opacity-ref.html
-fuzzy-if(Android,0-6,0-4) fuzzy-if(skiaContent&&!Android,0-1,0-34) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html
-fuzzy-if(Android,0-6,0-4) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html
+fuzzy-if(Android,0-6,0-4) fuzzy-if(skiaContent&&!Android,0-1,0-34) fuzzy-if(webrender&&gtkWidget,64-64,24-24) fuzzy-if(webrender&&cocoaWidget,7-7,37-37) skip-if(!asyncPan) == offscreen-clipped-blendmode-1.html offscreen-clipped-blendmode-ref.html
+fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&&gtkWidget,64-64,14-14) fuzzy-if(webrender&&cocoaWidget,7-7,37-37) skip-if(!asyncPan) == offscreen-clipped-blendmode-2.html offscreen-clipped-blendmode-ref.html
 fuzzy-if(Android,0-6,0-4) skip == offscreen-clipped-blendmode-3.html offscreen-clipped-blendmode-ref.html # bug 1251588 - wrong AGR on mix-blend-mode item
-fuzzy-if(Android,0-6,0-4) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html
-fuzzy-if(Android,0-7,0-4) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html
+fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&&gtkWidget,64-64,14-14) fuzzy-if(webrender&&cocoaWidget,7-7,37-37) skip-if(!asyncPan) == offscreen-clipped-blendmode-4.html offscreen-clipped-blendmode-ref.html
+fuzzy-if(Android,0-7,0-1406) fuzzy-if(webrender&&gtkWidget,1-1,20-20) fuzzy-if(webrender&&cocoaWidget,1-1,19-19) skip-if(!asyncPan) == perspective-scrolling-1.html perspective-scrolling-1-ref.html
 fuzzy-if(Android,0-7,0-4) skip-if(!asyncPan) == perspective-scrolling-2.html perspective-scrolling-2-ref.html
-fuzzy-if(Android,0-7,0-4) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html
-fuzzy-if(Android,0-7,0-4) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html
+fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&&gtkWidget,24-24,14-14) fuzzy-if(webrender&&cocoaWidget,13-13,39-39) skip-if(!asyncPan) == perspective-scrolling-3.html perspective-scrolling-3-ref.html
+fuzzy-if(Android,0-7,0-4) fuzzy-if(webrender&&gtkWidget,54-54,14-14) fuzzy-if(webrender&&cocoaWidget,20-20,40-40) skip-if(!asyncPan) == perspective-scrolling-4.html perspective-scrolling-4-ref.html
 skip-if(!asyncPan) == perspective-scrolling-5.html perspective-scrolling-5-ref.html
 pref(apz.disable_for_scroll_linked_effects,true) skip-if(!asyncPan) == disable-apz-for-sle-pages.html disable-apz-for-sle-pages-ref.html
 fuzzy-if(browserIsRemote&&d2d,0-1,0-22) skip-if(!asyncPan) fuzzy-if(geckoview,2-2,242-242) skip-if(geckoview&&debug) == background-blend-mode-1.html background-blend-mode-1-ref.html # bug 1558286 for GV
 skip-if(Android||!asyncPan) != opaque-fractional-displayport-1.html about:blank
 skip-if(Android||!asyncPan) != opaque-fractional-displayport-2.html about:blank
-fuzzy-if(Android,0-6,0-4) skip-if(!asyncPan) == fixed-pos-scrolled-clip-1.html fixed-pos-scrolled-clip-1-ref.html
-fuzzy-if(Android,0-6,0-8) skip-if(!asyncPan) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html
-fuzzy-if(Android,0-6,0-8) skip-if(!asyncPan) == fixed-pos-scrolled-clip-3.html fixed-pos-scrolled-clip-3-ref.html
-fuzzy-if(Android,0-6,0-8) skip-if(!asyncPan) == fixed-pos-scrolled-clip-4.html fixed-pos-scrolled-clip-4-ref.html
+fuzzy-if(Android,0-19,0-4) fuzzy-if(webrender&&gtkWidget,35-35,14-14) fuzzy-if(webrender&&cocoaWidget,22-22,44-44) skip-if(!asyncPan) == fixed-pos-scrolled-clip-1.html fixed-pos-scrolled-clip-1-ref.html
+fuzzy-if(Android,0-44,0-10) fuzzy-if(webrender&&gtkWidget,48-48,28-28) fuzzy-if(webrender&&cocoaWidget,13-13,76-76) skip-if(!asyncPan) == fixed-pos-scrolled-clip-2.html fixed-pos-scrolled-clip-2-ref.html
+fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&&gtkWidget,53-53,48-48) fuzzy-if(webrender&&cocoaWidget,19-19,72-72) skip-if(!asyncPan) == fixed-pos-scrolled-clip-3.html fixed-pos-scrolled-clip-3-ref.html
+fuzzy-if(Android,0-6,0-8) fuzzy-if(webrender&&gtkWidget,53-53,48-48) fuzzy-if(webrender&&cocoaWidget,19-19,72-72) skip-if(!asyncPan) == fixed-pos-scrolled-clip-4.html fixed-pos-scrolled-clip-4-ref.html
 skip-if(!asyncPan) == fixed-pos-scrolled-clip-5.html fixed-pos-scrolled-clip-5-ref.html
 skip-if(!asyncPan) == position-sticky-bug1434250.html position-sticky-bug1434250-ref.html
-fuzzy-if(Android,0-6,0-4) skip-if(!asyncPan) == position-sticky-scrolled-clip-1.html position-sticky-scrolled-clip-1-ref.html
+fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&&gtkWidget,47-47,24-24) fuzzy-if(webrender&&cocoaWidget,16-16,40-40) skip-if(!asyncPan) == position-sticky-scrolled-clip-1.html position-sticky-scrolled-clip-1-ref.html
 fuzzy-if(Android,0-6,0-4) skip == position-sticky-scrolled-clip-2.html position-sticky-scrolled-clip-2-ref.html # bug ?????? - incorrectly applying clip to sticky contents
-fuzzy-if(Android,0-2,0-4) skip-if(!asyncPan) == curtain-effect-1.html curtain-effect-1-ref.html
-fuzzy-if(Android,0-1,0-4) skip-if(!asyncPan) == transformed-1.html transformed-1-ref.html
-fuzzy-if(Android&&!webrender,2-2,4-4) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html
-fuzzy-if(Android&&!webrender,3-3,4-4) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html
-fuzzy-if(Android&&!webrender,3-3,4-4) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-1.html position-sticky-in-transformed-scrollframe-ref.html
-fuzzy-if(Android&&!webrender,3-3,4-4) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html
+fuzzy-if(Android,0-8,0-4) fuzzy-if(webrender&&cocoaWidget,11-11,39-39) skip-if(!asyncPan) == curtain-effect-1.html curtain-effect-1-ref.html
+fuzzy-if(Android,0-6,0-4) fuzzy-if(webrender&&gtkWidget,27-27,24-24) fuzzy-if(webrender&&cocoaWidget,9-9,37-37) skip-if(!asyncPan) == transformed-1.html transformed-1-ref.html
+fuzzy-if(Android&&!webrender,2-2,4-4) fuzzy-if(Android&&webrender,7-7,4-4) fuzzy-if(webrender&&gtkWidget,21-21,24-24) fuzzy-if(webrender&&cocoaWidget,6-6,37-37) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-1.html position-sticky-transformed-in-scrollframe-1-ref.html
+fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,10-10,4-4) fuzzy-if(webrender&&gtkWidget,37-37,24-24) fuzzy-if(webrender&&cocoaWidget,16-16,40-40) skip-if(!asyncPan) == position-sticky-transformed-in-scrollframe-2.html position-sticky-transformed-in-scrollframe-2-ref.html
+fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,13-13,4-4) fuzzy-if(webrender&&gtkWidget,9-9,14-14) fuzzy-if(webrender&&cocoaWidget,16-16,40-40) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-1.html position-sticky-in-transformed-scrollframe-ref.html
+fuzzy-if(Android&&!webrender,3-3,4-4) fuzzy-if(Android&&webrender,13-13,4-4) fuzzy-if(webrender&&gtkWidget,9-9,14-14) fuzzy-if(webrender&&cocoaWidget,16-16,40-40) skip-if(!asyncPan) == position-sticky-in-transformed-scrollframe-2.html position-sticky-in-transformed-scrollframe-ref.html
 
 # for the following tests, we want to disable the low-precision buffer
 # as it will expand the displayport beyond what the test specifies in
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/bidi/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/bidi/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/bidi/reftest.list	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/bidi/reftest.list	2019-09-15 11:33:17.000000000 +0000
@@ -163,11 +163,11 @@
 fuzzy-if(Android,0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2a-ltr.html brackets-2a-ltr-ref.html # Bug 1392106
 fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(Android,0-254,0-557) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2a-rtl.html brackets-2a-rtl-ref.html # Bug 1392106
 fuzzy-if(Android,0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2b-ltr.html brackets-2b-ltr-ref.html # Bug 1392106
-fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(Android,0-1,0-5) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2b-rtl.html brackets-2b-rtl-ref.html # Bug 1392106
-fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(Android,0-1,0-5) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2c-ltr.html brackets-2c-ltr-ref.html # Bug 1392106
+fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(Android,0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2b-rtl.html brackets-2b-rtl-ref.html # Bug 1392106
+fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(Android,0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2c-ltr.html brackets-2c-ltr-ref.html # Bug 1392106
 fuzzy-if(Android,0-254,0-231) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-2c-rtl.html brackets-2c-rtl-ref.html # Bug 1392106
 fuzzy-if(cocoaWidget,0-1,0-3) fuzzy-if(Android,0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3a-ltr.html brackets-3a-ltr-ref.html # Bug 1392106
-fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(Android,0-1,0-5) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3a-rtl.html brackets-3a-rtl-ref.html # Bug 1392106
+fuzzy-if(cocoaWidget,0-1,0-2) fuzzy-if(Android,0-1,0-6) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3a-rtl.html brackets-3a-rtl-ref.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3b-ltr.html brackets-3b-ltr-ref.html # Bug 1392106
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == brackets-3b-rtl.html brackets-3b-rtl-ref.html # Bug 1392106
 == 1217833-1.html 1217833-1-ref.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/border-image/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/border-image/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/border-image/reftest.list	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/border-image/reftest.list	2019-09-15 11:33:18.000000000 +0000
@@ -48,14 +48,14 @@
 fuzzy(0-1,0-433) fuzzy-if(skiaContent,0-1,0-2500) fuzzy-if(webrender&&!geckoview,1-3,83975-85584) == border-image-linear-gradient-slice-fill-1.html border-image-linear-gradient-slice-fill-1-ref.html
 fuzzy(0-1,0-177) fuzzy-if(OSX,0-1,0-25771) fuzzy-if(skiaContent&&!Android,0-1,0-400) fuzzy-if(Android,0-1,0-6093) fuzzy-if(webrender&&!geckoview,1-3,57249-57480) == border-image-linear-gradient-slice-fill-2.html border-image-linear-gradient-slice-fill-2-ref.html
 fuzzy(0-1,0-48)  fuzzy-if(OSX,0-5,0-1676) fuzzy-if(webrender&&!geckoview,1-1,4464-4537) == border-image-linear-gradient-width.html border-image-linear-gradient-width-ref.html
-fuzzy(0-1,0-5000) fuzzy-if(OSX,0-1,0-15000) fuzzy-if(webrender&&!geckoview,2-2,58625-58987) == border-image-linear-gradient-slice-width.html border-image-linear-gradient-slice-width-ref.html
-fuzzy(0-1,0-3000) fuzzy-if(OSX,0-1,0-6000) fuzzy-if(webrender&&!geckoview,1-3,25940-26413) == border-image-linear-gradient-outset.html border-image-linear-gradient-outset-ref.html
+fuzzy(0-1,0-5000) fuzzy-if(OSX,0-1,0-15000) fuzzy-if(webrender&&!geckoview,1-2,60222-60545) == border-image-linear-gradient-slice-width.html border-image-linear-gradient-slice-width-ref.html
+fuzzy(0-1,0-3000) fuzzy-if(OSX,0-1,0-6000) fuzzy-if(webrender&&!geckoview,1-3,25940-26688) == border-image-linear-gradient-outset.html border-image-linear-gradient-outset-ref.html
 fuzzy(0-1,0-12) fuzzy-if(skiaContent,0-1,0-400) fuzzy-if(webrender&&!geckoview,1-3,25966-26872) == border-image-linear-gradient-repeat-repeat-1.html border-image-linear-gradient-repeat-repeat-1-ref.html
 fuzzy(0-1,0-13) fuzzy-if(skiaContent,0-1,0-300) fuzzy-if(webrender&&!geckoview,1-3,26038-27131) == border-image-linear-gradient-repeat-round-1.html border-image-linear-gradient-repeat-round-1-ref.html
 fuzzy-if(webrender&&!geckoview,1-2,61283-67805) == border-image-linear-gradient-repeat-repeat-2.html border-image-linear-gradient-repeat-repeat-2-ref.html
 fuzzy(0-1,0-576) fuzzy-if(skiaContent,0-1,0-2000) fuzzy-if(webrender&&!geckoview,1-2,61764-68383) == border-image-linear-gradient-repeat-round-2.html border-image-linear-gradient-repeat-round-2-ref.html
 fuzzy(0-1,0-8533) fuzzy-if(webrender&&!geckoview,1-3,64622-85925) == border-image-linear-gradient-repeat-repeat-3.html border-image-linear-gradient-repeat-repeat-3-ref.html
-fuzzy(0-1,0-7161) fuzzy-if(webrender&&!geckoview,1-3,85018-86037) == border-image-linear-gradient-repeat-round-3.html border-image-linear-gradient-repeat-round-3-ref.html
+fuzzy(0-1,0-7161) fuzzy-if(webrender&&!geckoview,1-3,107185-107548) == border-image-linear-gradient-repeat-round-3.html border-image-linear-gradient-repeat-round-3-ref.html
 
 fuzzy-if(webrender,0-1,0-2096) == border-image-radial-gradient.html border-image-radial-gradient-ref.html
 fuzzy(0-1,0-42) fuzzy-if(skiaContent,0-2,0-20) fuzzy-if(webrender,0-1,0-37818) == border-image-radial-gradient-slice-1.html border-image-radial-gradient-slice-1-ref.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/box-shadow/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/box-shadow/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/box-shadow/reftest.list	2019-09-13 05:13:21.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/box-shadow/reftest.list	2019-09-15 11:33:17.000000000 +0000
@@ -11,7 +11,7 @@
 == boxshadow-rounding.html boxshadow-rounding-ref.html
 # One uses old path, one uses WR box shadow.
 fails-if(Android) == boxshadow-button.html boxshadow-button-ref.html
-fuzzy-if(OSX==1010,0-1,0-24) fuzzy-if(d2d,0-16,0-999) fuzzy-if(skiaContent,0-14,0-179) fuzzy-if(webrender,5-9,700-1080) == boxshadow-large-border-radius.html boxshadow-large-border-radius-ref.html # Bug 1209649
+fuzzy-if(OSX==1010,0-1,0-24) fuzzy-if(d2d,0-16,0-999) fuzzy-if(skiaContent,0-14,0-179) == boxshadow-large-border-radius.html boxshadow-large-border-radius-ref.html # Bug 1209649
 
 fails-if(Android) == boxshadow-fileupload.html boxshadow-fileupload-ref.html
 fuzzy-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu),0-98,0-152) fuzzy-if(skiaContent,0-13,0-28) fuzzy-if(webrender,19-19,47-47) == boxshadow-inner-basic.html boxshadow-inner-basic-ref.svg
@@ -29,7 +29,7 @@
 fuzzy(0-3,0-500) fuzzy-if(d2d,0-2,0-1080) == boxshadow-border-radius-int.html boxshadow-border-radius-int-ref.html
 == boxshadow-inset-neg-spread.html about:blank
 == boxshadow-inset-neg-spread2.html boxshadow-inset-neg-spread2-ref.html
-fuzzy(0-26,0-3610) fuzzy-if(d2d,0-26,0-5910) == boxshadow-rotated.html boxshadow-rotated-ref.html # Bug 1211264
+fuzzy(0-26,0-3610) fuzzy-if(d2d,0-26,0-5910) fuzzy-if(webrender,18-19,4184-4341) == boxshadow-rotated.html boxshadow-rotated-ref.html # Bug 1211264
 == boxshadow-inset-large-border-radius.html boxshadow-inset-large-border-radius-ref.html
 
 # fuzzy due to blur going inside, but as long as it's essentially black instead of a light gray its ok.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/bugs/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/bugs/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/bugs/reftest.list	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/bugs/reftest.list	2019-09-15 11:33:18.000000000 +0000
@@ -1143,7 +1143,7 @@
 != about:blank 438987-2-ref.html # check that backgrounds work at all
 == 439004-1.html 439004-1-ref.html
 == 439639-1.html 439639-1-ref.html
-== 439910.html 439910-ref.html
+fuzzy-if(gtkWidget,0-255,0-6) == 439910.html 439910-ref.html
 fuzzy-if(skiaContent,0-1,0-1) == 440112.html 440112-ref.html
 == 440149-1.html 440149-1-ref.html
 == 441259-1.html 441259-1-ref.html
@@ -1187,7 +1187,7 @@
 == 455105-2.html 455105-ref.html
 == 455171-5.html 455171-5-ref.html
 == 455280-1.xhtml 455280-1-ref.xhtml
-== 455826-1.html 455826-1-ref.html
+fails-if(Android) == 455826-1.html 455826-1-ref.html
 fails-if(Android||cocoaWidget||winWidget) == chrome://reftest/content/bugs/456147.xul 456147-ref.html # bug 458047
 fuzzy-if(Android,0-11,0-41) fuzzy-if(winWidget||gtkWidget,0-4,0-6) fuzzy-if(d2d,0-16,0-95) fuzzy-if(skiaContent,0-42,0-154) fuzzy-if(webrender,56-60,449-518) == 456219-1a.html 456219-1-ref.html # bug 1128229
 fuzzy-if(Android,0-11,0-41) fuzzy-if(winWidget||gtkWidget,0-4,0-6) fuzzy-if(d2d,0-16,0-99) fuzzy-if(skiaContent,0-42,0-154) fuzzy-if(webrender,56-60,449-518) == 456219-1b.html 456219-1-ref.html # bug 1128229
@@ -1603,7 +1603,8 @@
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 600974-3.html 600974-1-ref.html # Bug 1392106
 == 602200-1.html 602200-1-ref.html
 == 602200-2.html 602200-2-ref.html
-fuzzy-if(Android,0-8,0-20) == 602200-3.html 602200-3-ref.html
+# Canvas with a fractional margin does not snap properly; see bug 1580534
+fuzzy-if(Android,0-8,0-20) fails-if(webrender) == 602200-3.html 602200-3-ref.html
 == 602200-4.html 602200-4-ref.html
 == 603423-1.html 603423-1-ref.html
 == 604737.html 604737-ref.html
@@ -2088,19 +2089,19 @@
 fuzzy-if(winWidget&&!webrender,0-89,0-1418) == 1513423-2.html 1513423-2-ref.html
 == 1513423-3.html 1513423-3-ref.html
 fuzzy-if(!webrender,1-5,66-547) fuzzy-if(geckoview&&!webrender,1-2,64-141) == 1529992-1.html 1529992-1-ref.html
-fuzzy-if(!webrender,0-6,0-34) fuzzy-if(geckoview,9-9,44-44) fails-if(webrender) == 1529992-2.html 1529992-2-ref.html
+fuzzy-if(!webrender,0-6,0-34) fuzzy-if(Android,9-14,44-60) fails-if(webrender) == 1529992-2.html 1529992-2-ref.html
 == 1535040-1.html 1535040-1-ref.html
 == 1545360-1.xhtml 1545360-1-ref.xhtml
 skip-if(!asyncPan) == 1544895.html 1544895-ref.html
 == 1547759-1.html 1547759-1-ref.html
 == 1548809.html 1548809-ref.html
 != 1552789-1.html 1552789-ref-1.html
-pref(image.downscale-during-decode.enabled,true) fuzzy-if(webrender,3-4,17665-18088) == 1553571-1.html 1553571-1-ref.html
+pref(image.downscale-during-decode.enabled,true) == 1553571-1.html 1553571-1-ref.html
 == 1558937-1.html 1558937-1-ref.html
 != 1563484.html 1563484-notref.html
 == 1563484.html 1563484-ref.html
-fuzzy-if(!webrender||!winWidget,254-255,464-1613) fuzzy-if(geckoview&&webrender,253-253,1392-1397) == 1562733-rotated-nastaliq-1.html 1562733-rotated-nastaliq-1-ref.html
-fuzzy-if(winWidget&&webrender,0-31,0-3) fuzzy-if(geckoview&&webrender,0-93,0-16) == 1562733-rotated-nastaliq-2.html 1562733-rotated-nastaliq-2-ref.html
+fuzzy-if(!webrender||!winWidget,251-255,464-1613) fuzzy-if(geckoview&&webrender,251-253,1392-1397) == 1562733-rotated-nastaliq-1.html 1562733-rotated-nastaliq-1-ref.html
+fuzzy-if(winWidget&&webrender,0-31,0-3) fuzzy-if(geckoview&&webrender,0-93,0-26) == 1562733-rotated-nastaliq-2.html 1562733-rotated-nastaliq-2-ref.html
 test-pref(plain_text.wrap_long_lines,false) != 1565129.txt 1565129.txt
 fuzzy(0-32,0-8) fuzzy-if(Android&&webrender,0-32,0-1458) == 1576553-1.html 1576553-1-ref.html
 == 1579953-2.html 1579953-2-ref.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/css-blending/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/css-blending/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/css-blending/reftest.list	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/css-blending/reftest.list	2019-09-15 11:33:18.000000000 +0000
@@ -38,7 +38,7 @@
 fuzzy-if(azureSkia||d2d||gtkWidget,0-1,0-40000) == background-blending-image-color-959674.html background-blending-image-color-959674-ref.html
 
 #fuzzy due to inconsistencies in rounded rect cliping between parent and child; may be related to antialiasing. Between platforms, the max difference is the same, and the number of different pixels is either 36 or 37. (Win, Mac and Lin)
-fuzzy(0-65,0-53) fuzzy-if(geckoview&&webrender,64-64,163-163) == mix-blend-mode-952051.html mix-blend-mode-952051-ref.html
+fuzzy(0-65,0-53) fuzzy-if(geckoview&&webrender,63-64,163-328) == mix-blend-mode-952051.html mix-blend-mode-952051-ref.html
 
 fuzzy-if(d3d11,0-49,0-200) == mix-blend-mode-and-filter.html mix-blend-mode-and-filter-ref.html
 fuzzy-if(d3d11,0-1,0-5) == mix-blend-mode-and-filter.svg mix-blend-mode-and-filter-ref.svg
@@ -48,7 +48,7 @@
 == mix-blend-mode-nested-976533.html mix-blend-mode-nested-976533-ref.html
 == mix-blend-mode-culling-1207041.html mix-blend-mode-culling-1207041-ref.html
 == mix-blend-mode-dest-alpha-1135271.html mix-blend-mode-dest-alpha-1135271-ref.html
-fuzzy-if(geckoview&&webrender,3-3,849-849) == clipped-mixblendmode-containing-unclipped-stuff.html clipped-mixblendmode-containing-unclipped-stuff-ref.html
+== clipped-mixblendmode-containing-unclipped-stuff.html clipped-mixblendmode-containing-unclipped-stuff-ref.html
 fuzzy(0-1,0-6800) == clipped-opacity-containing-unclipped-mixblendmode.html clipped-opacity-containing-unclipped-mixblendmode-ref.html
 
 # Test plan 5.3.1 Blending between the background layers and the background color for an element with background-blend-mode
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/css-break/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/css-break/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/css-break/reftest.list	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/css-break/reftest.list	2019-09-15 11:33:18.000000000 +0000
@@ -1,5 +1,5 @@
 == box-decoration-break-1.html box-decoration-break-1-ref.html
-fuzzy(0-1,0-20) fuzzy-if(skiaContent,0-1,0-700) fuzzy-if(webrender,20-26,8891-12681) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html
+fuzzy(0-1,0-20) fuzzy-if(skiaContent,0-1,0-700) == box-decoration-break-with-inset-box-shadow-1.html box-decoration-break-with-inset-box-shadow-1-ref.html
 skip-if(verify) fuzzy(0-45,0-460) fuzzy-if(skiaContent,0-57,0-439) fuzzy-if(Android,0-57,0-1330) random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == box-decoration-break-with-outset-box-shadow-1.html box-decoration-break-with-outset-box-shadow-1-ref.html # Bug 1386543, bug 1392106
 random-if(!gtkWidget||webrender) == box-decoration-break-border-image.html box-decoration-break-border-image-ref.html
 == box-decoration-break-block-border-padding.html box-decoration-break-block-border-padding-ref.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/font-inflation/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/font-inflation/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/font-inflation/reftest.list	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/font-inflation/reftest.list	2019-09-15 11:33:18.000000000 +0000
@@ -120,7 +120,7 @@
 
 pref(font.size.inflation.emPerLine,15) pref(font.size.inflation.forceEnabled,true) pref(font.size.inflation.lineThreshold,0) == min-width-passes-1.html min-width-passes-1-ref.html
 
-pref(font.size.inflation.emPerLine,15) pref(font.size.inflation.forceEnabled,true) == xul-reflow-1.html xul-reflow-1-ref.html
+random-if(gtkWidget) pref(font.size.inflation.emPerLine,15) pref(font.size.inflation.forceEnabled,true) == xul-reflow-1.html xul-reflow-1-ref.html
 
 # reset the default preferences
 default-preferences
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/mathml/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/mathml/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/mathml/reftest.list	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/mathml/reftest.list	2019-09-15 11:33:18.000000000 +0000
@@ -23,7 +23,7 @@
 == css-spacing-1.html css-spacing-1-ref.html
 pref(mathml.disabled,true) == disabled-scriptlevel-1.html disabled-scriptlevel-1-ref.html
 pref(mathml.disabled,true) == disabled-scriptlevel-1.xhtml disabled-scriptlevel-1-ref.xhtml
-random-if(smallScreen&&Android) fuzzy(0-255,0-200) fuzzy-if(webrender&&winWidget,114-255,265-304) fuzzy-if(webrender&&OSX,87-87,242-242) == mirror-op-1.html mirror-op-1-ref.html
+random-if(smallScreen&&Android) fuzzy(0-255,0-200) fuzzy-if(geckoview&&webrender,216-216,312-314) fuzzy-if(webrender&&winWidget,114-255,265-361) fuzzy-if(webrender&&OSX,79-79,314-314) == mirror-op-1.html mirror-op-1-ref.html
 != mirror-op-2.html mirror-op-2-ref.html
 != mirror-op-3.html mirror-op-3-ref.html
 != mirror-op-4.html mirror-op-4-ref.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/pagination/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/pagination/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/pagination/reftest.list	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/pagination/reftest.list	2019-09-15 11:33:18.000000000 +0000
@@ -72,7 +72,7 @@
 # == table-caption-splitaftercaption-10.html blank.html # bug 672654
 # == table-caption-splitaftercaption-11.html blank.html # bug 672654
 == column-balancing-break-inside-avoid-2.html column-balancing-break-inside-avoid-2-ref.html
-fuzzy-if(Android,0-1,0-2) == combobox-page-break-inside.html combobox-page-break-inside-ref.html
+fuzzy-if(Android,0-4,0-2) == combobox-page-break-inside.html combobox-page-break-inside-ref.html
 == table-nested-1308876-1.xhtml table-nested-1308876-1-ref.html
 test-pref(layout.css.contain.enabled,true) == contain-size-break-001.html contain-size-break-001-ref.html
 test-pref(layout.css.contain.enabled,true) == contain-size-break-002.html contain-size-break-002-ref.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/position-sticky/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/position-sticky/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/position-sticky/reftest.list	2019-09-13 05:13:22.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/position-sticky/reftest.list	2019-09-15 11:33:18.000000000 +0000
@@ -50,6 +50,6 @@
 == block-in-inline-continuations.html block-in-inline-continuations-ref.html
 == iframe-1.html iframe-1-ref.html
 == transformed-1.html transformed-1-ref.html
-fuzzy-if(Android,0-2,0-4) skip-if(!asyncPan) == transformed-2.html transformed-2-ref.html
-skip-if(!asyncPan) fuzzy-if(Android,0-3,0-4) == nested-sticky-1.html nested-sticky-1-ref.html
-skip-if(!asyncPan) fuzzy-if(Android,0-3,0-4) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-4,0-104) == nested-sticky-2.html nested-sticky-2-ref.html
+fuzzy-if(Android,0-4,0-4) fuzzy-if(webrender&&gtkWidget,31-31,24-24) fuzzy-if(webrender&&cocoaWidget,8-8,37-37) skip-if(!asyncPan) == transformed-2.html transformed-2-ref.html
+skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(webrender&&gtkWidget,57-57,24-24) fuzzy-if(webrender&&cocoaWidget,16-16,40-40) == nested-sticky-1.html nested-sticky-1-ref.html
+skip-if(!asyncPan) fuzzy-if(Android,0-10,0-4) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),0-4,0-104) fuzzy-if(webrender&&gtkWidget,57-57,24-24) fuzzy-if(webrender&&cocoaWidget,16-16,40-40) == nested-sticky-2.html nested-sticky-2-ref.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/text/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/text/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/text/reftest.list	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/text/reftest.list	2019-09-15 11:33:19.000000000 +0000
@@ -189,7 +189,7 @@
 fails-if(/^Windows\x20NT\x2010\.0/.test(http.oscpu)) == 1463020-letter-spacing-text-transform-1.html 1463020-letter-spacing-text-transform-1-ref.html # Win10: regional indicators not supported by system emoji font
 fails-if(Android) == 1463020-letter-spacing-text-transform-2.html 1463020-letter-spacing-text-transform-2-ref.html # missing font coverage on Android
 == 1507661-spurious-hyphenation-after-explicit.html 1507661-spurious-hyphenation-after-explicit-ref.html
-fuzzy-if(!webrender,12-66,288-1660) == 1522857-1.html 1522857-1-ref.html # antialiasing fuzz in non-webrender cases
+fuzzy-if(!webrender,12-66,288-1660) fails-if(gtkWidget&&!webrender) == 1522857-1.html 1522857-1-ref.html # antialiasing fuzz in non-webrender cases
 
 # ensure emoji chars don't render blank (bug 715798, bug 779042);
 # should at least render hexboxes if there's no font support
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/writing-mode/reftest.list firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/writing-mode/reftest.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/reftests/writing-mode/reftest.list	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/reftests/writing-mode/reftest.list	2019-09-15 11:33:19.000000000 +0000
@@ -146,11 +146,11 @@
 random-if(/^Windows\x20NT\x206\.1/.test(http.oscpu)) == 1188061-2-nsChangeHint_UpdateComputedBSize.html 1188061-2-nsChangeHint_UpdateComputedBSize-ref.html # Bug 1392106
 
 # tests involving sideways-lr mode
-== 1193519-sideways-lr-1.html 1193519-sideways-lr-1-ref.html
-== 1193519-sideways-lr-2.html 1193519-sideways-lr-2-ref.html
-fuzzy-if(winWidget,0-3,0-84) fails-if(webrender&&!gtkWidget) == 1193519-sideways-lr-3.html 1193519-sideways-lr-3-ref.html
-fuzzy-if(winWidget,0-3,0-112) fails-if(webrender||Android) == 1193519-sideways-lr-4.html 1193519-sideways-lr-4-ref.html # see bug 1366692. Rounding error with WR enabled, and on Android.
-fuzzy-if(gtkWidget,0-255,0-6) fuzzy-if(cocoaWidget,0-65,0-69) fuzzy-if(geckoview&&webrender,0-255,0-4) == 1193519-sideways-lr-decoration-1.html 1193519-sideways-lr-decoration-1-ref.html
+random-if(gtkWidget) == 1193519-sideways-lr-1.html 1193519-sideways-lr-1-ref.html
+random-if(gtkWidget) == 1193519-sideways-lr-2.html 1193519-sideways-lr-2-ref.html
+fuzzy-if(winWidget,0-3,0-84) fails-if(webrender&&winWidget) == 1193519-sideways-lr-3.html 1193519-sideways-lr-3-ref.html
+fuzzy-if(winWidget,0-3,0-112) fails-if(webrender&&!cocoaWidget) fails-if(Android) random-if(gtkWidget) == 1193519-sideways-lr-4.html 1193519-sideways-lr-4-ref.html # see bug 1366692. Rounding error with WR enabled, and on Android.
+fuzzy-if(gtkWidget,0-255,0-12) fuzzy-if(cocoaWidget,0-65,0-69) fuzzy-if(geckoview&&webrender,0-255,0-7) == 1193519-sideways-lr-decoration-1.html 1193519-sideways-lr-decoration-1-ref.html
 
 == 1196887-1-computed-display-inline-block.html 1196887-1-computed-display-inline-block-ref.html
 == 1205787-legacy-svg-values-1.html 1205787-legacy-svg-values-1-ref.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/style/crashtests/1580307.html firefox-trunk-71.0~a1~hg20190915r493291/layout/style/crashtests/1580307.html
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/style/crashtests/1580307.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/style/crashtests/1580307.html	2019-09-15 11:33:19.000000000 +0000
@@ -0,0 +1 @@
+<legend style="justify-items: left legacy; overflow-y: hidden">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/style/crashtests/crashtests.list firefox-trunk-71.0~a1~hg20190915r493291/layout/style/crashtests/crashtests.list
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/style/crashtests/crashtests.list	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/style/crashtests/crashtests.list	2019-09-15 11:33:19.000000000 +0000
@@ -308,3 +308,4 @@
 pref(layout.css.resizeobserver.enabled,true) load 1552911.html
 load 1562361.html
 load 1566684.html
+load 1580307.html
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/tables/nsTableFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/tables/nsTableFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/tables/nsTableFrame.cpp	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/tables/nsTableFrame.cpp	2019-09-15 11:33:19.000000000 +0000
@@ -6925,20 +6925,19 @@
   for (const auto& segment : segments) {
     auto rect = LayoutDeviceRect::FromUnknownRect(NSRectToRect(
         segment.mRect + aOffset, aBorderParams.mAppUnitsPerDevPixel));
-    auto roundedRect = wr::ToRoundedLayoutRect(rect);
+    auto r = wr::ToLayoutRect(rect);
     auto color = wr::ToColorF(ToDeviceColor(segment.mColor));
 
     // Adjust for the start bevel if needed.
-    AdjustAndPushBevel(aBuilder, roundedRect, segment.mColor,
-                       segment.mStartBevel, aBorderParams.mAppUnitsPerDevPixel,
+    AdjustAndPushBevel(aBuilder, r, segment.mColor, segment.mStartBevel,
+                       aBorderParams.mAppUnitsPerDevPixel,
                        aBorderParams.mBackfaceIsVisible, true);
 
-    AdjustAndPushBevel(aBuilder, roundedRect, segment.mColor, segment.mEndBevel,
+    AdjustAndPushBevel(aBuilder, r, segment.mColor, segment.mEndBevel,
                        aBorderParams.mAppUnitsPerDevPixel,
                        aBorderParams.mBackfaceIsVisible, false);
 
-    aBuilder.PushRect(roundedRect, roundedRect,
-                      aBorderParams.mBackfaceIsVisible, color);
+    aBuilder.PushRect(r, r, aBorderParams.mBackfaceIsVisible, color);
   }
 }
 
@@ -6953,7 +6952,7 @@
   auto borderRect = LayoutDeviceRect::FromUnknownRect(NSRectToRect(
       aBorderParams.mBorderRect + aOffset, aBorderParams.mAppUnitsPerDevPixel));
 
-  wr::LayoutRect roundedRect = wr::ToRoundedLayoutRect(borderRect);
+  wr::LayoutRect r = wr::ToLayoutRect(borderRect);
   wr::BorderSide wrSide[4];
   NS_FOR_CSS_SIDES(i) {
     wrSide[i] = wr::ToBorderSide(ToDeviceColor(aBorderParams.mBorderColor),
@@ -6961,8 +6960,7 @@
   }
   const bool horizontal = aBorderParams.mStartBevelSide == eSideTop ||
                           aBorderParams.mStartBevelSide == eSideBottom;
-  auto borderWidth =
-      horizontal ? roundedRect.size.height : roundedRect.size.width;
+  auto borderWidth = horizontal ? r.size.height : r.size.width;
 
   // All border style is set to none except left side. So setting the widths of
   // each side to width of rect is fine.
@@ -6978,9 +6976,8 @@
   }
 
   Range<const wr::BorderSide> wrsides(wrSide, 4);
-  aBuilder.PushBorder(roundedRect, roundedRect,
-                      aBorderParams.mBackfaceIsVisible, borderWidths, wrsides,
-                      wr::EmptyBorderRadius());
+  aBuilder.PushBorder(r, r, aBorderParams.mBackfaceIsVisible, borderWidths,
+                      wrsides, wr::EmptyBorderRadius());
 }
 
 void BCBlockDirSeg::CreateWebRenderCommands(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/xul/nsBox.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/xul/nsBox.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/xul/nsBox.cpp	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/xul/nsBox.cpp	2019-09-15 11:33:19.000000000 +0000
@@ -54,9 +54,18 @@
   return SyncLayout(aState);
 }
 
+bool nsBox::gGotTheme = false;
+StaticRefPtr<nsITheme> nsBox::gTheme;
+
 nsBox::nsBox(ComputedStyle* aStyle, nsPresContext* aPresContext, ClassID aID)
     : nsIFrame(aStyle, aPresContext, aID) {
   MOZ_COUNT_CTOR(nsBox);
+  if (!gGotTheme) {
+    gTheme = do_GetNativeTheme();
+    if (gTheme) {
+      gGotTheme = true;
+    }
+  }
 }
 
 nsBox::~nsBox() {
@@ -65,6 +74,12 @@
   MOZ_COUNT_DTOR(nsBox);
 }
 
+/* static */
+void nsBox::Shutdown() {
+  gGotTheme = false;
+  gTheme = nullptr;
+}
+
 nsresult nsBox::XULRelayoutChildAtOrdinal(nsIFrame* aChild) { return NS_OK; }
 
 nsresult nsIFrame::GetXULClientRect(nsRect& aClientRect) {
@@ -128,17 +143,15 @@
   aMargin.SizeTo(0, 0, 0, 0);
 
   const nsStyleDisplay* disp = StyleDisplay();
-  if (disp->HasAppearance()) {
+  if (disp->HasAppearance() && gTheme) {
+    // Go to the theme for the border.
     nsPresContext* context = PresContext();
-    if (nsITheme* theme = context->GetTheme()) {
-      // Go to the theme for the border.
-      if (theme->ThemeSupportsWidget(context, this, disp->mAppearance)) {
-        LayoutDeviceIntMargin margin = theme->GetWidgetBorder(
-            context->DeviceContext(), this, disp->mAppearance);
-        aMargin = LayoutDevicePixel::ToAppUnits(margin,
-                                                context->AppUnitsPerDevPixel());
-        return NS_OK;
-      }
+    if (gTheme->ThemeSupportsWidget(context, this, disp->mAppearance)) {
+      LayoutDeviceIntMargin margin = gTheme->GetWidgetBorder(
+          context->DeviceContext(), this, disp->mAppearance);
+      aMargin =
+          LayoutDevicePixel::ToAppUnits(margin, context->AppUnitsPerDevPixel());
+      return NS_OK;
     }
   }
 
@@ -149,19 +162,17 @@
 
 nsresult nsBox::GetXULPadding(nsMargin& aPadding) {
   const nsStyleDisplay* disp = StyleDisplay();
-  if (disp->HasAppearance()) {
+  if (disp->HasAppearance() && gTheme) {
+    // Go to the theme for the padding.
     nsPresContext* context = PresContext();
-    if (nsITheme* theme = context->GetTheme()) {
-      // Go to the theme for the padding.
-      if (theme->ThemeSupportsWidget(context, this, disp->mAppearance)) {
-        LayoutDeviceIntMargin padding;
-        bool useThemePadding = theme->GetWidgetPadding(
-            context->DeviceContext(), this, disp->mAppearance, &padding);
-        if (useThemePadding) {
-          aPadding = LayoutDevicePixel::ToAppUnits(
-              padding, context->AppUnitsPerDevPixel());
-          return NS_OK;
-        }
+    if (gTheme->ThemeSupportsWidget(context, this, disp->mAppearance)) {
+      LayoutDeviceIntMargin padding;
+      bool useThemePadding = gTheme->GetWidgetPadding(
+          context->DeviceContext(), this, disp->mAppearance, &padding);
+      if (useThemePadding) {
+        aPadding = LayoutDevicePixel::ToAppUnits(
+            padding, context->AppUnitsPerDevPixel());
+        return NS_OK;
       }
     }
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/xul/nsBox.h firefox-trunk-71.0~a1~hg20190915r493291/layout/xul/nsBox.h
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/xul/nsBox.h	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/xul/nsBox.h	2019-09-15 11:33:19.000000000 +0000
@@ -11,10 +11,14 @@
 #include "mozilla/StaticPtr.h"
 #include "nsIFrame.h"
 
+class nsITheme;
+
 class nsBox : public nsIFrame {
  public:
   friend class nsIFrame;
 
+  static void Shutdown();
+
   virtual nsSize GetXULPrefSize(nsBoxLayoutState& aBoxLayoutState) override;
   virtual nsSize GetXULMinSize(nsBoxLayoutState& aBoxLayoutState) override;
   virtual nsSize GetXULMaxSize(nsBoxLayoutState& aBoxLayoutState) override;
@@ -78,6 +82,9 @@
   NS_IMETHOD DoXULLayout(nsBoxLayoutState& aBoxLayoutState);
   nsresult EndXULLayout(nsBoxLayoutState& aState);
 
+  static bool gGotTheme;
+  static mozilla::StaticRefPtr<nsITheme> gTheme;
+
   enum eMouseThrough { unset, never, always };
 };
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/layout/xul/nsImageBoxFrame.cpp firefox-trunk-71.0~a1~hg20190915r493291/layout/xul/nsImageBoxFrame.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/layout/xul/nsImageBoxFrame.cpp	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/layout/xul/nsImageBoxFrame.cpp	2019-09-15 11:33:19.000000000 +0000
@@ -260,9 +260,9 @@
     // Only get the list-style-image if we aren't being drawn
     // by a native theme.
     auto* display = StyleDisplay();
-    nsITheme* theme;
-    if (!(display->HasAppearance() && (theme = presContext->GetTheme()) &&
-          theme->ThemeSupportsWidget(nullptr, this, display->mAppearance))) {
+    if (!(display->HasAppearance() && nsBox::gTheme &&
+          nsBox::gTheme->ThemeSupportsWidget(nullptr, this,
+                                             display->mAppearance))) {
       // get the list-style-image
       imgRequestProxy* styleRequest = StyleList()->GetListStyleImage();
       if (styleRequest) {
@@ -418,7 +418,6 @@
   const int32_t appUnitsPerDevPixel = PresContext()->AppUnitsPerDevPixel();
   LayoutDeviceRect fillRect =
       LayoutDeviceRect::FromAppUnits(dest, appUnitsPerDevPixel);
-  fillRect.Round();
 
   Maybe<SVGImageContext> svgContext;
   gfx::IntSize decodeSize =
@@ -442,12 +441,9 @@
   if (key.isNothing()) {
     return result;
   }
-  wr::LayoutRect fill = wr::ToLayoutRect(fillRect);
 
-  LayoutDeviceSize gapSize(0, 0);
-  aBuilder.PushImage(fill, fill, !BackfaceIsHidden(),
-                     wr::ToLayoutSize(fillRect.Size()),
-                     wr::ToLayoutSize(gapSize), rendering, key.value());
+  wr::LayoutRect fill = wr::ToLayoutRect(fillRect);
+  aBuilder.PushImage(fill, fill, !BackfaceIsHidden(), rendering, key.value());
 
   return result;
 }
@@ -624,9 +620,8 @@
 
   // If we're using a native theme implementation, we shouldn't draw anything.
   const nsStyleDisplay* disp = StyleDisplay();
-  nsITheme* theme;
-  if (disp->HasAppearance() && (theme = PresContext()->GetTheme()) &&
-      theme->ThemeSupportsWidget(nullptr, this, disp->mAppearance))
+  if (disp->HasAppearance() && nsBox::gTheme &&
+      nsBox::gTheme->ThemeSupportsWidget(nullptr, this, disp->mAppearance))
     return;
 
   // If list-style-image changes, we have a new image.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/moz.build firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/moz.build
--- firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/moz.build	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/moz.build	2019-09-15 11:33:19.000000000 +0000
@@ -25,10 +25,6 @@
     'gmp-clearkey.cpp',
 ]
 
-SOURCES += [
-    'openaes/oaes_lib.c',
-]
-
 if CONFIG['OS_ARCH'] == 'WINNT':
     UNIFIED_SOURCES += [
         'VideoDecoder.cpp',
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/LICENSE firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/LICENSE
--- firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/LICENSE	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/LICENSE	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
----------------------------------------------------------------------------
-OpenAES Licence
----------------------------------------------------------------------------
-Copyright (c) 2012, Nabil S. Al Ramli, www.nalramli.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
----------------------------------------------------------------------------
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/oaes_common.h firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/oaes_common.h
--- firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/oaes_common.h	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/oaes_common.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,77 +0,0 @@
-/* 
- * ---------------------------------------------------------------------------
- * OpenAES License
- * ---------------------------------------------------------------------------
- * Copyright (c) 2013, Nabil S. Al Ramli, www.nalramli.com
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *   - Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * ---------------------------------------------------------------------------
- */
-
-#ifndef _OAES_COMMON_H
-#define _OAES_COMMON_H
-
-#include <stdint.h>
-
-#ifdef __cplusplus 
-extern "C" {
-#endif
-
-#ifdef _WIN32
-#	ifdef OAES_SHARED
-#		ifdef oaes_lib_EXPORTS
-#			define OAES_API __declspec(dllexport)
-#		else
-#			define OAES_API __declspec(dllimport)
-#		endif
-#	else
-#		define OAES_API
-#	endif
-#else
-#	define OAES_API
-#endif // WIN32
-
-#define OAES_VERSION "0.9.0"
-
-typedef enum
-{
-	OAES_RET_FIRST = 0,
-	OAES_RET_SUCCESS = 0,
-	OAES_RET_ERROR,
-	OAES_RET_ARG1,
-	OAES_RET_ARG2,
-	OAES_RET_ARG3,
-	OAES_RET_ARG4,
-	OAES_RET_ARG5,
-	OAES_RET_NOKEY,
-	OAES_RET_MEM,
-	OAES_RET_BUF,
-	OAES_RET_HEADER,
-	OAES_RET_COUNT
-} OAES_RET;
-
-#ifdef __cplusplus 
-}
-#endif
-
-#endif // _OAES_COMMON_H
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/oaes_config.h firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/oaes_config.h
--- firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/oaes_config.h	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/oaes_config.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,46 +0,0 @@
-/* 
- * ---------------------------------------------------------------------------
- * OpenAES License
- * ---------------------------------------------------------------------------
- * Copyright (c) 2012, Nabil S. Al Ramli, www.nalramli.com
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *   - Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * ---------------------------------------------------------------------------
- */
-
-#ifndef _OAES_CONFIG_H
-#define _OAES_CONFIG_H
-
-#ifdef __cplusplus 
-extern "C" {
-#endif
-
-#ifndef OAES_DEBUG
-#define OAES_DEBUG 0
-#endif // OAES_DEBUG
-
-#ifdef __cplusplus 
-}
-#endif
-
-#endif // _OAES_CONFIG_H
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/oaes_lib.c firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/oaes_lib.c
--- firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/oaes_lib.c	2019-09-13 05:13:24.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/oaes_lib.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,1393 +0,0 @@
-/* 
- * ---------------------------------------------------------------------------
- * OpenAES License
- * ---------------------------------------------------------------------------
- * Copyright (c) 2012, Nabil S. Al Ramli, www.nalramli.com
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *   - Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * ---------------------------------------------------------------------------
- */
-
-#include <stdlib.h>
-#include <stddef.h>
-#include <time.h> 
-#include <string.h>
-
-#include "mozilla/Sprintf.h"
-
-#ifdef WIN32
-#include <process.h>
-#endif
-
-#include "oaes_config.h"
-#include "oaes_lib.h"
-
-#ifdef OAES_HAVE_ISAAC
-#include "rand.h"
-#define OAES_RAND(x) rand(x)
-#else
-#define OAES_RAND(x) rand()
-#endif // OAES_HAVE_ISAAC
-
-#define OAES_RKEY_LEN 4
-#define OAES_COL_LEN 4
-#define OAES_ROUND_BASE 7
-
-// the block is padded
-#define OAES_FLAG_PAD 0x01
-
-#ifndef min
-# define min(a,b) (((a)<(b)) ? (a) : (b))
-#endif /* min */
-
-typedef struct _oaes_key
-{
-	size_t data_len;
-	uint8_t *data;
-	size_t exp_data_len;
-	uint8_t *exp_data;
-	size_t num_keys;
-	size_t key_base;
-} oaes_key;
-
-typedef struct _oaes_ctx
-{
-#ifdef OAES_HAVE_ISAAC
-  randctx * rctx;
-#endif // OAES_HAVE_ISAAC
-
-#ifdef OAES_DEBUG
-	oaes_step_cb step_cb;
-#endif // OAES_DEBUG
-
-	oaes_key * key;
-	OAES_OPTION options;
-	uint8_t iv[OAES_BLOCK_SIZE];
-} oaes_ctx;
-
-// "OAES<8-bit header version><8-bit type><16-bit options><8-bit flags><56-bit reserved>"
-static uint8_t oaes_header[OAES_BLOCK_SIZE] = {
-	// 		0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    a,    b,    c,    d,    e,    f,
-	/*0*/	0x4f, 0x41, 0x45, 0x53, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-};
-static uint8_t oaes_gf_8[] = {
-	0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36 };
-
-static uint8_t oaes_sub_byte_value[16][16] = {
-	// 		0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    a,    b,    c,    d,    e,    f,
-	/*0*/	0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b, 0xfe, 0xd7, 0xab, 0x76,
-	/*1*/	0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0, 0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0,
-	/*2*/	0xb7, 0xfd, 0x93, 0x26, 0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
-	/*3*/	0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2, 0xeb, 0x27, 0xb2, 0x75,
-	/*4*/	0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0, 0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84,
-	/*5*/	0x53, 0xd1, 0x00, 0xed, 0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-	/*6*/	0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f, 0x50, 0x3c, 0x9f, 0xa8,
-	/*7*/	0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5, 0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2,
-	/*8*/	0xcd, 0x0c, 0x13, 0xec, 0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
-	/*9*/	0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14, 0xde, 0x5e, 0x0b, 0xdb,
-	/*a*/	0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c, 0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79,
-	/*b*/	0xe7, 0xc8, 0x37, 0x6d, 0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-	/*c*/	0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f, 0x4b, 0xbd, 0x8b, 0x8a,
-	/*d*/	0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e, 0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e,
-	/*e*/	0xe1, 0xf8, 0x98, 0x11, 0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
-	/*f*/	0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f, 0xb0, 0x54, 0xbb, 0x16,
-};
-
-static uint8_t oaes_inv_sub_byte_value[16][16] = {
-	// 		0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    a,    b,    c,    d,    e,    f,
-	/*0*/	0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e, 0x81, 0xf3, 0xd7, 0xfb,
-	/*1*/	0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87, 0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb,
-	/*2*/	0x54, 0x7b, 0x94, 0x32, 0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
-	/*3*/	0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49, 0x6d, 0x8b, 0xd1, 0x25,
-	/*4*/	0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92,
-	/*5*/	0x6c, 0x70, 0x48, 0x50, 0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
-	/*6*/	0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05, 0xb8, 0xb3, 0x45, 0x06,
-	/*7*/	0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02, 0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b,
-	/*8*/	0x3a, 0x91, 0x11, 0x41, 0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
-	/*9*/	0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8, 0x1c, 0x75, 0xdf, 0x6e,
-	/*a*/	0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89, 0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b,
-	/*b*/	0xfc, 0x56, 0x3e, 0x4b, 0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
-	/*c*/	0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xec, 0x5f,
-	/*d*/	0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d, 0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef,
-	/*e*/	0xa0, 0xe0, 0x3b, 0x4d, 0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
-	/*f*/	0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d,
-};
-
-static uint8_t oaes_gf_mul_2[16][16] = {
-	// 		0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    a,    b,    c,    d,    e,    f,
-	/*0*/	0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e, 0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
-	/*1*/	0x20, 0x22, 0x24, 0x26, 0x28, 0x2a, 0x2c, 0x2e, 0x30, 0x32, 0x34, 0x36, 0x38, 0x3a, 0x3c, 0x3e,
-	/*2*/	0x40, 0x42, 0x44, 0x46, 0x48, 0x4a, 0x4c, 0x4e, 0x50, 0x52, 0x54, 0x56, 0x58, 0x5a, 0x5c, 0x5e,
-	/*3*/	0x60, 0x62, 0x64, 0x66, 0x68, 0x6a, 0x6c, 0x6e, 0x70, 0x72, 0x74, 0x76, 0x78, 0x7a, 0x7c, 0x7e,
-	/*4*/	0x80, 0x82, 0x84, 0x86, 0x88, 0x8a, 0x8c, 0x8e, 0x90, 0x92, 0x94, 0x96, 0x98, 0x9a, 0x9c, 0x9e,
-	/*5*/	0xa0, 0xa2, 0xa4, 0xa6, 0xa8, 0xaa, 0xac, 0xae, 0xb0, 0xb2, 0xb4, 0xb6, 0xb8, 0xba, 0xbc, 0xbe,
-	/*6*/	0xc0, 0xc2, 0xc4, 0xc6, 0xc8, 0xca, 0xcc, 0xce, 0xd0, 0xd2, 0xd4, 0xd6, 0xd8, 0xda, 0xdc, 0xde,
-	/*7*/	0xe0, 0xe2, 0xe4, 0xe6, 0xe8, 0xea, 0xec, 0xee, 0xf0, 0xf2, 0xf4, 0xf6, 0xf8, 0xfa, 0xfc, 0xfe,
-	/*8*/	0x1b, 0x19, 0x1f, 0x1d, 0x13, 0x11, 0x17, 0x15, 0x0b, 0x09, 0x0f, 0x0d, 0x03, 0x01, 0x07, 0x05,
-	/*9*/	0x3b, 0x39, 0x3f, 0x3d, 0x33, 0x31, 0x37, 0x35, 0x2b, 0x29, 0x2f, 0x2d, 0x23, 0x21, 0x27, 0x25,
-	/*a*/	0x5b, 0x59, 0x5f, 0x5d, 0x53, 0x51, 0x57, 0x55, 0x4b, 0x49, 0x4f, 0x4d, 0x43, 0x41, 0x47, 0x45,
-	/*b*/	0x7b, 0x79, 0x7f, 0x7d, 0x73, 0x71, 0x77, 0x75, 0x6b, 0x69, 0x6f, 0x6d, 0x63, 0x61, 0x67, 0x65,
-	/*c*/	0x9b, 0x99, 0x9f, 0x9d, 0x93, 0x91, 0x97, 0x95, 0x8b, 0x89, 0x8f, 0x8d, 0x83, 0x81, 0x87, 0x85,
-	/*d*/	0xbb, 0xb9, 0xbf, 0xbd, 0xb3, 0xb1, 0xb7, 0xb5, 0xab, 0xa9, 0xaf, 0xad, 0xa3, 0xa1, 0xa7, 0xa5,
-	/*e*/	0xdb, 0xd9, 0xdf, 0xdd, 0xd3, 0xd1, 0xd7, 0xd5, 0xcb, 0xc9, 0xcf, 0xcd, 0xc3, 0xc1, 0xc7, 0xc5,
-	/*f*/	0xfb, 0xf9, 0xff, 0xfd, 0xf3, 0xf1, 0xf7, 0xf5, 0xeb, 0xe9, 0xef, 0xed, 0xe3, 0xe1, 0xe7, 0xe5,
-};
-
-static uint8_t oaes_gf_mul_3[16][16] = {
-	// 		0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    a,    b,    c,    d,    e,    f,
-	/*0*/	0x00, 0x03, 0x06, 0x05, 0x0c, 0x0f, 0x0a, 0x09, 0x18, 0x1b, 0x1e, 0x1d, 0x14, 0x17, 0x12, 0x11,
-	/*1*/	0x30, 0x33, 0x36, 0x35, 0x3c, 0x3f, 0x3a, 0x39, 0x28, 0x2b, 0x2e, 0x2d, 0x24, 0x27, 0x22, 0x21,
-	/*2*/	0x60, 0x63, 0x66, 0x65, 0x6c, 0x6f, 0x6a, 0x69, 0x78, 0x7b, 0x7e, 0x7d, 0x74, 0x77, 0x72, 0x71,
-	/*3*/	0x50, 0x53, 0x56, 0x55, 0x5c, 0x5f, 0x5a, 0x59, 0x48, 0x4b, 0x4e, 0x4d, 0x44, 0x47, 0x42, 0x41,
-	/*4*/	0xc0, 0xc3, 0xc6, 0xc5, 0xcc, 0xcf, 0xca, 0xc9, 0xd8, 0xdb, 0xde, 0xdd, 0xd4, 0xd7, 0xd2, 0xd1,
-	/*5*/	0xf0, 0xf3, 0xf6, 0xf5, 0xfc, 0xff, 0xfa, 0xf9, 0xe8, 0xeb, 0xee, 0xed, 0xe4, 0xe7, 0xe2, 0xe1,
-	/*6*/	0xa0, 0xa3, 0xa6, 0xa5, 0xac, 0xaf, 0xaa, 0xa9, 0xb8, 0xbb, 0xbe, 0xbd, 0xb4, 0xb7, 0xb2, 0xb1,
-	/*7*/	0x90, 0x93, 0x96, 0x95, 0x9c, 0x9f, 0x9a, 0x99, 0x88, 0x8b, 0x8e, 0x8d, 0x84, 0x87, 0x82, 0x81,
-	/*8*/	0x9b, 0x98, 0x9d, 0x9e, 0x97, 0x94, 0x91, 0x92, 0x83, 0x80, 0x85, 0x86, 0x8f, 0x8c, 0x89, 0x8a,
-	/*9*/	0xab, 0xa8, 0xad, 0xae, 0xa7, 0xa4, 0xa1, 0xa2, 0xb3, 0xb0, 0xb5, 0xb6, 0xbf, 0xbc, 0xb9, 0xba,
-	/*a*/	0xfb, 0xf8, 0xfd, 0xfe, 0xf7, 0xf4, 0xf1, 0xf2, 0xe3, 0xe0, 0xe5, 0xe6, 0xef, 0xec, 0xe9, 0xea,
-	/*b*/	0xcb, 0xc8, 0xcd, 0xce, 0xc7, 0xc4, 0xc1, 0xc2, 0xd3, 0xd0, 0xd5, 0xd6, 0xdf, 0xdc, 0xd9, 0xda,
-	/*c*/	0x5b, 0x58, 0x5d, 0x5e, 0x57, 0x54, 0x51, 0x52, 0x43, 0x40, 0x45, 0x46, 0x4f, 0x4c, 0x49, 0x4a,
-	/*d*/	0x6b, 0x68, 0x6d, 0x6e, 0x67, 0x64, 0x61, 0x62, 0x73, 0x70, 0x75, 0x76, 0x7f, 0x7c, 0x79, 0x7a,
-	/*e*/	0x3b, 0x38, 0x3d, 0x3e, 0x37, 0x34, 0x31, 0x32, 0x23, 0x20, 0x25, 0x26, 0x2f, 0x2c, 0x29, 0x2a,
-	/*f*/	0x0b, 0x08, 0x0d, 0x0e, 0x07, 0x04, 0x01, 0x02, 0x13, 0x10, 0x15, 0x16, 0x1f, 0x1c, 0x19, 0x1a,
-};
-
-static uint8_t oaes_gf_mul_9[16][16] = {
-	// 		0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    a,    b,    c,    d,    e,    f,
-	/*0*/	0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36, 0x3f, 0x48, 0x41, 0x5a, 0x53, 0x6c, 0x65, 0x7e, 0x77,
-	/*1*/	0x90, 0x99, 0x82, 0x8b, 0xb4, 0xbd, 0xa6, 0xaf, 0xd8, 0xd1, 0xca, 0xc3, 0xfc, 0xf5, 0xee, 0xe7,
-	/*2*/	0x3b, 0x32, 0x29, 0x20, 0x1f, 0x16, 0x0d, 0x04, 0x73, 0x7a, 0x61, 0x68, 0x57, 0x5e, 0x45, 0x4c,
-	/*3*/	0xab, 0xa2, 0xb9, 0xb0, 0x8f, 0x86, 0x9d, 0x94, 0xe3, 0xea, 0xf1, 0xf8, 0xc7, 0xce, 0xd5, 0xdc,
-	/*4*/	0x76, 0x7f, 0x64, 0x6d, 0x52, 0x5b, 0x40, 0x49, 0x3e, 0x37, 0x2c, 0x25, 0x1a, 0x13, 0x08, 0x01,
-	/*5*/	0xe6, 0xef, 0xf4, 0xfd, 0xc2, 0xcb, 0xd0, 0xd9, 0xae, 0xa7, 0xbc, 0xb5, 0x8a, 0x83, 0x98, 0x91,
-	/*6*/	0x4d, 0x44, 0x5f, 0x56, 0x69, 0x60, 0x7b, 0x72, 0x05, 0x0c, 0x17, 0x1e, 0x21, 0x28, 0x33, 0x3a,
-	/*7*/	0xdd, 0xd4, 0xcf, 0xc6, 0xf9, 0xf0, 0xeb, 0xe2, 0x95, 0x9c, 0x87, 0x8e, 0xb1, 0xb8, 0xa3, 0xaa,
-	/*8*/	0xec, 0xe5, 0xfe, 0xf7, 0xc8, 0xc1, 0xda, 0xd3, 0xa4, 0xad, 0xb6, 0xbf, 0x80, 0x89, 0x92, 0x9b,
-	/*9*/	0x7c, 0x75, 0x6e, 0x67, 0x58, 0x51, 0x4a, 0x43, 0x34, 0x3d, 0x26, 0x2f, 0x10, 0x19, 0x02, 0x0b,
-	/*a*/	0xd7, 0xde, 0xc5, 0xcc, 0xf3, 0xfa, 0xe1, 0xe8, 0x9f, 0x96, 0x8d, 0x84, 0xbb, 0xb2, 0xa9, 0xa0,
-	/*b*/	0x47, 0x4e, 0x55, 0x5c, 0x63, 0x6a, 0x71, 0x78, 0x0f, 0x06, 0x1d, 0x14, 0x2b, 0x22, 0x39, 0x30,
-	/*c*/	0x9a, 0x93, 0x88, 0x81, 0xbe, 0xb7, 0xac, 0xa5, 0xd2, 0xdb, 0xc0, 0xc9, 0xf6, 0xff, 0xe4, 0xed,
-	/*d*/	0x0a, 0x03, 0x18, 0x11, 0x2e, 0x27, 0x3c, 0x35, 0x42, 0x4b, 0x50, 0x59, 0x66, 0x6f, 0x74, 0x7d,
-	/*e*/	0xa1, 0xa8, 0xb3, 0xba, 0x85, 0x8c, 0x97, 0x9e, 0xe9, 0xe0, 0xfb, 0xf2, 0xcd, 0xc4, 0xdf, 0xd6,
-	/*f*/	0x31, 0x38, 0x23, 0x2a, 0x15, 0x1c, 0x07, 0x0e, 0x79, 0x70, 0x6b, 0x62, 0x5d, 0x54, 0x4f, 0x46,
-};
-
-static uint8_t oaes_gf_mul_b[16][16] = {
-	// 		0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    a,    b,    c,    d,    e,    f,
-	/*0*/	0x00, 0x0b, 0x16, 0x1d, 0x2c, 0x27, 0x3a, 0x31, 0x58, 0x53, 0x4e, 0x45, 0x74, 0x7f, 0x62, 0x69,
-	/*1*/	0xb0, 0xbb, 0xa6, 0xad, 0x9c, 0x97, 0x8a, 0x81, 0xe8, 0xe3, 0xfe, 0xf5, 0xc4, 0xcf, 0xd2, 0xd9,
-	/*2*/	0x7b, 0x70, 0x6d, 0x66, 0x57, 0x5c, 0x41, 0x4a, 0x23, 0x28, 0x35, 0x3e, 0x0f, 0x04, 0x19, 0x12,
-	/*3*/	0xcb, 0xc0, 0xdd, 0xd6, 0xe7, 0xec, 0xf1, 0xfa, 0x93, 0x98, 0x85, 0x8e, 0xbf, 0xb4, 0xa9, 0xa2,
-	/*4*/	0xf6, 0xfd, 0xe0, 0xeb, 0xda, 0xd1, 0xcc, 0xc7, 0xae, 0xa5, 0xb8, 0xb3, 0x82, 0x89, 0x94, 0x9f,
-	/*5*/	0x46, 0x4d, 0x50, 0x5b, 0x6a, 0x61, 0x7c, 0x77, 0x1e, 0x15, 0x08, 0x03, 0x32, 0x39, 0x24, 0x2f,
-	/*6*/	0x8d, 0x86, 0x9b, 0x90, 0xa1, 0xaa, 0xb7, 0xbc, 0xd5, 0xde, 0xc3, 0xc8, 0xf9, 0xf2, 0xef, 0xe4,
-	/*7*/	0x3d, 0x36, 0x2b, 0x20, 0x11, 0x1a, 0x07, 0x0c, 0x65, 0x6e, 0x73, 0x78, 0x49, 0x42, 0x5f, 0x54,
-	/*8*/	0xf7, 0xfc, 0xe1, 0xea, 0xdb, 0xd0, 0xcd, 0xc6, 0xaf, 0xa4, 0xb9, 0xb2, 0x83, 0x88, 0x95, 0x9e,
-	/*9*/	0x47, 0x4c, 0x51, 0x5a, 0x6b, 0x60, 0x7d, 0x76, 0x1f, 0x14, 0x09, 0x02, 0x33, 0x38, 0x25, 0x2e,
-	/*a*/	0x8c, 0x87, 0x9a, 0x91, 0xa0, 0xab, 0xb6, 0xbd, 0xd4, 0xdf, 0xc2, 0xc9, 0xf8, 0xf3, 0xee, 0xe5,
-	/*b*/	0x3c, 0x37, 0x2a, 0x21, 0x10, 0x1b, 0x06, 0x0d, 0x64, 0x6f, 0x72, 0x79, 0x48, 0x43, 0x5e, 0x55,
-	/*c*/	0x01, 0x0a, 0x17, 0x1c, 0x2d, 0x26, 0x3b, 0x30, 0x59, 0x52, 0x4f, 0x44, 0x75, 0x7e, 0x63, 0x68,
-	/*d*/	0xb1, 0xba, 0xa7, 0xac, 0x9d, 0x96, 0x8b, 0x80, 0xe9, 0xe2, 0xff, 0xf4, 0xc5, 0xce, 0xd3, 0xd8,
-	/*e*/	0x7a, 0x71, 0x6c, 0x67, 0x56, 0x5d, 0x40, 0x4b, 0x22, 0x29, 0x34, 0x3f, 0x0e, 0x05, 0x18, 0x13,
-	/*f*/	0xca, 0xc1, 0xdc, 0xd7, 0xe6, 0xed, 0xf0, 0xfb, 0x92, 0x99, 0x84, 0x8f, 0xbe, 0xb5, 0xa8, 0xa3,
-};
-
-static uint8_t oaes_gf_mul_d[16][16] = {
-	// 		0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    a,    b,    c,    d,    e,    f,
-	/*0*/	0x00, 0x0d, 0x1a, 0x17, 0x34, 0x39, 0x2e, 0x23, 0x68, 0x65, 0x72, 0x7f, 0x5c, 0x51, 0x46, 0x4b,
-	/*1*/	0xd0, 0xdd, 0xca, 0xc7, 0xe4, 0xe9, 0xfe, 0xf3, 0xb8, 0xb5, 0xa2, 0xaf, 0x8c, 0x81, 0x96, 0x9b,
-	/*2*/	0xbb, 0xb6, 0xa1, 0xac, 0x8f, 0x82, 0x95, 0x98, 0xd3, 0xde, 0xc9, 0xc4, 0xe7, 0xea, 0xfd, 0xf0,
-	/*3*/	0x6b, 0x66, 0x71, 0x7c, 0x5f, 0x52, 0x45, 0x48, 0x03, 0x0e, 0x19, 0x14, 0x37, 0x3a, 0x2d, 0x20,
-	/*4*/	0x6d, 0x60, 0x77, 0x7a, 0x59, 0x54, 0x43, 0x4e, 0x05, 0x08, 0x1f, 0x12, 0x31, 0x3c, 0x2b, 0x26,
-	/*5*/	0xbd, 0xb0, 0xa7, 0xaa, 0x89, 0x84, 0x93, 0x9e, 0xd5, 0xd8, 0xcf, 0xc2, 0xe1, 0xec, 0xfb, 0xf6,
-	/*6*/	0xd6, 0xdb, 0xcc, 0xc1, 0xe2, 0xef, 0xf8, 0xf5, 0xbe, 0xb3, 0xa4, 0xa9, 0x8a, 0x87, 0x90, 0x9d,
-	/*7*/	0x06, 0x0b, 0x1c, 0x11, 0x32, 0x3f, 0x28, 0x25, 0x6e, 0x63, 0x74, 0x79, 0x5a, 0x57, 0x40, 0x4d,
-	/*8*/	0xda, 0xd7, 0xc0, 0xcd, 0xee, 0xe3, 0xf4, 0xf9, 0xb2, 0xbf, 0xa8, 0xa5, 0x86, 0x8b, 0x9c, 0x91,
-	/*9*/	0x0a, 0x07, 0x10, 0x1d, 0x3e, 0x33, 0x24, 0x29, 0x62, 0x6f, 0x78, 0x75, 0x56, 0x5b, 0x4c, 0x41,
-	/*a*/	0x61, 0x6c, 0x7b, 0x76, 0x55, 0x58, 0x4f, 0x42, 0x09, 0x04, 0x13, 0x1e, 0x3d, 0x30, 0x27, 0x2a,
-	/*b*/	0xb1, 0xbc, 0xab, 0xa6, 0x85, 0x88, 0x9f, 0x92, 0xd9, 0xd4, 0xc3, 0xce, 0xed, 0xe0, 0xf7, 0xfa,
-	/*c*/	0xb7, 0xba, 0xad, 0xa0, 0x83, 0x8e, 0x99, 0x94, 0xdf, 0xd2, 0xc5, 0xc8, 0xeb, 0xe6, 0xf1, 0xfc,
-	/*d*/	0x67, 0x6a, 0x7d, 0x70, 0x53, 0x5e, 0x49, 0x44, 0x0f, 0x02, 0x15, 0x18, 0x3b, 0x36, 0x21, 0x2c,
-	/*e*/	0x0c, 0x01, 0x16, 0x1b, 0x38, 0x35, 0x22, 0x2f, 0x64, 0x69, 0x7e, 0x73, 0x50, 0x5d, 0x4a, 0x47,
-	/*f*/	0xdc, 0xd1, 0xc6, 0xcb, 0xe8, 0xe5, 0xf2, 0xff, 0xb4, 0xb9, 0xae, 0xa3, 0x80, 0x8d, 0x9a, 0x97,
-};
-
-static uint8_t oaes_gf_mul_e[16][16] = {
-	// 		0,    1,    2,    3,    4,    5,    6,    7,    8,    9,    a,    b,    c,    d,    e,    f,
-	/*0*/	0x00, 0x0e, 0x1c, 0x12, 0x38, 0x36, 0x24, 0x2a, 0x70, 0x7e, 0x6c, 0x62, 0x48, 0x46, 0x54, 0x5a,
-	/*1*/	0xe0, 0xee, 0xfc, 0xf2, 0xd8, 0xd6, 0xc4, 0xca, 0x90, 0x9e, 0x8c, 0x82, 0xa8, 0xa6, 0xb4, 0xba,
-	/*2*/	0xdb, 0xd5, 0xc7, 0xc9, 0xe3, 0xed, 0xff, 0xf1, 0xab, 0xa5, 0xb7, 0xb9, 0x93, 0x9d, 0x8f, 0x81,
-	/*3*/	0x3b, 0x35, 0x27, 0x29, 0x03, 0x0d, 0x1f, 0x11, 0x4b, 0x45, 0x57, 0x59, 0x73, 0x7d, 0x6f, 0x61,
-	/*4*/	0xad, 0xa3, 0xb1, 0xbf, 0x95, 0x9b, 0x89, 0x87, 0xdd, 0xd3, 0xc1, 0xcf, 0xe5, 0xeb, 0xf9, 0xf7,
-	/*5*/	0x4d, 0x43, 0x51, 0x5f, 0x75, 0x7b, 0x69, 0x67, 0x3d, 0x33, 0x21, 0x2f, 0x05, 0x0b, 0x19, 0x17,
-	/*6*/	0x76, 0x78, 0x6a, 0x64, 0x4e, 0x40, 0x52, 0x5c, 0x06, 0x08, 0x1a, 0x14, 0x3e, 0x30, 0x22, 0x2c,
-	/*7*/	0x96, 0x98, 0x8a, 0x84, 0xae, 0xa0, 0xb2, 0xbc, 0xe6, 0xe8, 0xfa, 0xf4, 0xde, 0xd0, 0xc2, 0xcc,
-	/*8*/	0x41, 0x4f, 0x5d, 0x53, 0x79, 0x77, 0x65, 0x6b, 0x31, 0x3f, 0x2d, 0x23, 0x09, 0x07, 0x15, 0x1b,
-	/*9*/	0xa1, 0xaf, 0xbd, 0xb3, 0x99, 0x97, 0x85, 0x8b, 0xd1, 0xdf, 0xcd, 0xc3, 0xe9, 0xe7, 0xf5, 0xfb,
-	/*a*/	0x9a, 0x94, 0x86, 0x88, 0xa2, 0xac, 0xbe, 0xb0, 0xea, 0xe4, 0xf6, 0xf8, 0xd2, 0xdc, 0xce, 0xc0,
-	/*b*/	0x7a, 0x74, 0x66, 0x68, 0x42, 0x4c, 0x5e, 0x50, 0x0a, 0x04, 0x16, 0x18, 0x32, 0x3c, 0x2e, 0x20,
-	/*c*/	0xec, 0xe2, 0xf0, 0xfe, 0xd4, 0xda, 0xc8, 0xc6, 0x9c, 0x92, 0x80, 0x8e, 0xa4, 0xaa, 0xb8, 0xb6,
-	/*d*/	0x0c, 0x02, 0x10, 0x1e, 0x34, 0x3a, 0x28, 0x26, 0x7c, 0x72, 0x60, 0x6e, 0x44, 0x4a, 0x58, 0x56,
-	/*e*/	0x37, 0x39, 0x2b, 0x25, 0x0f, 0x01, 0x13, 0x1d, 0x47, 0x49, 0x5b, 0x55, 0x7f, 0x71, 0x63, 0x6d,
-	/*f*/	0xd7, 0xd9, 0xcb, 0xc5, 0xef, 0xe1, 0xf3, 0xfd, 0xa7, 0xa9, 0xbb, 0xb5, 0x9f, 0x91, 0x83, 0x8d,
-};
-
-static OAES_RET oaes_sub_byte( uint8_t * byte )
-{
-	size_t _x, _y;
-	
-	if( NULL == byte )
-		return OAES_RET_ARG1;
-
-	_x = _y = *byte;
-	_x &= 0x0f;
-	_y &= 0xf0;
-	_y >>= 4;
-	*byte = oaes_sub_byte_value[_y][_x];
-	
-	return OAES_RET_SUCCESS;
-}
-
-static OAES_RET oaes_inv_sub_byte( uint8_t * byte )
-{
-	size_t _x, _y;
-	
-	if( NULL == byte )
-		return OAES_RET_ARG1;
-
-	_x = _y = *byte;
-	_x &= 0x0f;
-	_y &= 0xf0;
-	_y >>= 4;
-	*byte = oaes_inv_sub_byte_value[_y][_x];
-	
-	return OAES_RET_SUCCESS;
-}
-
-static OAES_RET oaes_word_rot_left( uint8_t word[OAES_COL_LEN] )
-{
-	uint8_t _temp[OAES_COL_LEN];
-	
-	if( NULL == word )
-		return OAES_RET_ARG1;
-
-	memcpy( _temp, word + 1, OAES_COL_LEN - 1 );
-	_temp[OAES_COL_LEN - 1] = word[0];
-	memcpy( word, _temp, OAES_COL_LEN );
-	
-	return OAES_RET_SUCCESS;
-}
-
-static OAES_RET oaes_shift_rows( uint8_t block[OAES_BLOCK_SIZE] )
-{
-	uint8_t _temp[OAES_BLOCK_SIZE];
-
-	if( NULL == block )
-		return OAES_RET_ARG1;
-
-	_temp[0x00] = block[0x00];
-	_temp[0x01] = block[0x05];
-	_temp[0x02] = block[0x0a];
-	_temp[0x03] = block[0x0f];
-	_temp[0x04] = block[0x04];
-	_temp[0x05] = block[0x09];
-	_temp[0x06] = block[0x0e];
-	_temp[0x07] = block[0x03];
-	_temp[0x08] = block[0x08];
-	_temp[0x09] = block[0x0d];
-	_temp[0x0a] = block[0x02];
-	_temp[0x0b] = block[0x07];
-	_temp[0x0c] = block[0x0c];
-	_temp[0x0d] = block[0x01];
-	_temp[0x0e] = block[0x06];
-	_temp[0x0f] = block[0x0b];
-	memcpy( block, _temp, OAES_BLOCK_SIZE );
-	
-	return OAES_RET_SUCCESS;
-}
-
-static OAES_RET oaes_inv_shift_rows( uint8_t block[OAES_BLOCK_SIZE] )
-{
-	uint8_t _temp[OAES_BLOCK_SIZE];
-
-	if( NULL == block )
-		return OAES_RET_ARG1;
-
-	_temp[0x00] = block[0x00];
-	_temp[0x01] = block[0x0d];
-	_temp[0x02] = block[0x0a];
-	_temp[0x03] = block[0x07];
-	_temp[0x04] = block[0x04];
-	_temp[0x05] = block[0x01];
-	_temp[0x06] = block[0x0e];
-	_temp[0x07] = block[0x0b];
-	_temp[0x08] = block[0x08];
-	_temp[0x09] = block[0x05];
-	_temp[0x0a] = block[0x02];
-	_temp[0x0b] = block[0x0f];
-	_temp[0x0c] = block[0x0c];
-	_temp[0x0d] = block[0x09];
-	_temp[0x0e] = block[0x06];
-	_temp[0x0f] = block[0x03];
-	memcpy( block, _temp, OAES_BLOCK_SIZE );
-	
-	return OAES_RET_SUCCESS;
-}
-
-static uint8_t oaes_gf_mul(uint8_t left, uint8_t right)
-{
-	size_t _x, _y;
-	
-	_x = _y = left;
-	_x &= 0x0f;
-	_y &= 0xf0;
-	_y >>= 4;
-	
-	switch( right )
-	{
-		case 0x02:
-			return oaes_gf_mul_2[_y][_x];
-			break;
-		case 0x03:
-			return oaes_gf_mul_3[_y][_x];
-			break;
-		case 0x09:
-			return oaes_gf_mul_9[_y][_x];
-			break;
-		case 0x0b:
-			return oaes_gf_mul_b[_y][_x];
-			break;
-		case 0x0d:
-			return oaes_gf_mul_d[_y][_x];
-			break;
-		case 0x0e:
-			return oaes_gf_mul_e[_y][_x];
-			break;
-		default:
-			return left;
-			break;
-	}
-}
-
-static OAES_RET oaes_mix_cols( uint8_t word[OAES_COL_LEN] )
-{
-	uint8_t _temp[OAES_COL_LEN];
-
-	if( NULL == word )
-		return OAES_RET_ARG1;
-	
-	_temp[0] = oaes_gf_mul(word[0], 0x02) ^ oaes_gf_mul( word[1], 0x03 ) ^
-			word[2] ^ word[3];
-	_temp[1] = word[0] ^ oaes_gf_mul( word[1], 0x02 ) ^
-			oaes_gf_mul( word[2], 0x03 ) ^ word[3];
-	_temp[2] = word[0] ^ word[1] ^
-			oaes_gf_mul( word[2], 0x02 ) ^ oaes_gf_mul( word[3], 0x03 );
-	_temp[3] = oaes_gf_mul( word[0], 0x03 ) ^ word[1] ^
-			word[2] ^ oaes_gf_mul( word[3], 0x02 );
-	memcpy( word, _temp, OAES_COL_LEN );
-	
-	return OAES_RET_SUCCESS;
-}
-
-static OAES_RET oaes_inv_mix_cols( uint8_t word[OAES_COL_LEN] )
-{
-	uint8_t _temp[OAES_COL_LEN];
-
-	if( NULL == word )
-		return OAES_RET_ARG1;
-	
-	_temp[0] = oaes_gf_mul( word[0], 0x0e ) ^ oaes_gf_mul( word[1], 0x0b ) ^
-			oaes_gf_mul( word[2], 0x0d ) ^ oaes_gf_mul( word[3], 0x09 );
-	_temp[1] = oaes_gf_mul( word[0], 0x09 ) ^ oaes_gf_mul( word[1], 0x0e ) ^
-			oaes_gf_mul( word[2], 0x0b ) ^ oaes_gf_mul( word[3], 0x0d );
-	_temp[2] = oaes_gf_mul( word[0], 0x0d ) ^ oaes_gf_mul( word[1], 0x09 ) ^
-			oaes_gf_mul( word[2], 0x0e ) ^ oaes_gf_mul( word[3], 0x0b );
-	_temp[3] = oaes_gf_mul( word[0], 0x0b ) ^ oaes_gf_mul( word[1], 0x0d ) ^
-			oaes_gf_mul( word[2], 0x09 ) ^ oaes_gf_mul( word[3], 0x0e );
-	memcpy( word, _temp, OAES_COL_LEN );
-	
-	return OAES_RET_SUCCESS;
-}
-
-OAES_RET oaes_sprintf(
-		char * buf, size_t * buf_len, const uint8_t * data, size_t data_len )
-{
-	size_t _i, _buf_len_in;
-	char _temp[4];
-	
-	if( NULL == buf_len )
-		return OAES_RET_ARG2;
-
-	_buf_len_in = *buf_len;
-	*buf_len = data_len * 3 + data_len / OAES_BLOCK_SIZE + 1;
-	
-	if( NULL == buf )
-		return OAES_RET_SUCCESS;
-
-	if( *buf_len > _buf_len_in )
-		return OAES_RET_BUF;
-
-	if( NULL == data )
-		return OAES_RET_ARG3;
-
-	strcpy( buf, "" );
-	
-	for( _i = 0; _i < data_len; _i++ )
-	{
-		snprintf( _temp, sizeof(_temp), "%02x ", data[_i] );
-		strcat( buf, _temp );
-		if( _i && 0 == ( _i + 1 ) % OAES_BLOCK_SIZE )
-			strcat( buf, "\n" );
-	}
-	
-	return OAES_RET_SUCCESS;
-}
-
-/*
-#ifdef OAES_HAVE_ISAAC
-static void oaes_get_seed( char buf[RANDSIZ + 1] )
-{
-	struct timeb timer;
-	struct tm *gmTimer;
-	char * _test = NULL;
-	
-	ftime (&timer);
-	gmTimer = gmtime( &timer.time );
-	_test = (char *) calloc( sizeof( char ), timer.millitm );
-	sprintf( buf, "%04d%02d%02d%02d%02d%02d%03d%p%d",
-		gmTimer->tm_year + 1900, gmTimer->tm_mon + 1, gmTimer->tm_mday,
-		gmTimer->tm_hour, gmTimer->tm_min, gmTimer->tm_sec, timer.millitm,
-		_test + timer.millitm, getpid() );
-	
-	if( _test )
-		free( _test );
-}
-#else
-static uint32_t oaes_get_seed()
-{
-	struct timeb timer;
-	struct tm *gmTimer;
-	char * _test = NULL;
-	uint32_t _ret = 0;
-	
-	ftime (&timer);
-	gmTimer = gmtime( &timer.time );
-	_test = (char *) calloc( sizeof( char ), timer.millitm );
-	_ret = gmTimer->tm_year + 1900 + gmTimer->tm_mon + 1 + gmTimer->tm_mday +
-			gmTimer->tm_hour + gmTimer->tm_min + gmTimer->tm_sec + timer.millitm +
-			(uint32_t) ( _test + timer.millitm ) + getpid();
-
-	if( _test )
-		free( _test );
-	
-	return _ret;
-}
-#endif // OAES_HAVE_ISAAC
-*/
-
-static OAES_RET oaes_key_destroy( oaes_key ** key )
-{
-	if( NULL == *key )
-		return OAES_RET_SUCCESS;
-	
-	if( (*key)->data )
-	{
-		free( (*key)->data );
-		(*key)->data = NULL;
-	}
-	
-	if( (*key)->exp_data )
-	{
-		free( (*key)->exp_data );
-		(*key)->exp_data = NULL;
-	}
-	
-	(*key)->data_len = 0;
-	(*key)->exp_data_len = 0;
-	(*key)->num_keys = 0;
-	(*key)->key_base = 0;
-	free( *key );
-	*key = NULL;
-	
-	return OAES_RET_SUCCESS;
-}
-
-static OAES_RET oaes_key_expand( OAES_CTX * ctx )
-{
-	size_t _i, _j;
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-	
-	if( NULL == _ctx->key )
-		return OAES_RET_NOKEY;
-	
-	_ctx->key->key_base = _ctx->key->data_len / OAES_RKEY_LEN;
-	_ctx->key->num_keys =  _ctx->key->key_base + OAES_ROUND_BASE;
-					
-	_ctx->key->exp_data_len = _ctx->key->num_keys * OAES_RKEY_LEN * OAES_COL_LEN;
-	_ctx->key->exp_data = (uint8_t *)
-			calloc( _ctx->key->exp_data_len, sizeof( uint8_t ));
-	
-	if( NULL == _ctx->key->exp_data )
-		return OAES_RET_MEM;
-	
-	// the first _ctx->key->data_len are a direct copy
-	memcpy( _ctx->key->exp_data, _ctx->key->data, _ctx->key->data_len );
-
-	// apply ExpandKey algorithm for remainder
-	for( _i = _ctx->key->key_base; _i < _ctx->key->num_keys * OAES_RKEY_LEN; _i++ )
-	{
-		uint8_t _temp[OAES_COL_LEN];
-		
-		memcpy( _temp,
-				_ctx->key->exp_data + ( _i - 1 ) * OAES_RKEY_LEN, OAES_COL_LEN );
-		
-		// transform key column
-		if( 0 == _i % _ctx->key->key_base )
-		{
-			oaes_word_rot_left( _temp );
-
-			for( _j = 0; _j < OAES_COL_LEN; _j++ )
-				oaes_sub_byte( _temp + _j );
-
-			_temp[0] = _temp[0] ^ oaes_gf_8[ _i / _ctx->key->key_base - 1 ];
-		}
-		else if( _ctx->key->key_base > 6 && 4 == _i % _ctx->key->key_base )
-		{
-			for( _j = 0; _j < OAES_COL_LEN; _j++ )
-				oaes_sub_byte( _temp + _j );
-		}
-		
-		for( _j = 0; _j < OAES_COL_LEN; _j++ )
-		{
-			_ctx->key->exp_data[ _i * OAES_RKEY_LEN + _j ] =
-					_ctx->key->exp_data[ ( _i - _ctx->key->key_base ) *
-					OAES_RKEY_LEN + _j ] ^ _temp[_j];
-		}
-	}
-	
-	return OAES_RET_SUCCESS;
-}
-
-static OAES_RET oaes_key_gen( OAES_CTX * ctx, size_t key_size )
-{
-	size_t _i;
-	oaes_key * _key = NULL;
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	OAES_RET _rc = OAES_RET_SUCCESS;
-	
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-	
-	_key = (oaes_key *) calloc( sizeof( oaes_key ), 1 );
-	
-	if( NULL == _key )
-		return OAES_RET_MEM;
-	
-	if( _ctx->key )
-		oaes_key_destroy( &(_ctx->key) );
-	
-	_key->data_len = key_size;
-	_key->data = (uint8_t *) calloc( key_size, sizeof( uint8_t ));
-	
-	if( NULL == _key->data )
-	{
-		oaes_key_destroy( &_key );
-		return OAES_RET_MEM;
-	}
-	
-	for( _i = 0; _i < key_size; _i++ )
-		_key->data[_i] = (uint8_t) OAES_RAND(_ctx->rctx);
-	
-	_ctx->key = _key;
-	_rc = _rc || oaes_key_expand( ctx );
-	
-	if( _rc != OAES_RET_SUCCESS )
-	{
-		oaes_key_destroy( &(_ctx->key) );
-		return _rc;
-	}
-	
-	return OAES_RET_SUCCESS;
-}
-
-OAES_RET oaes_key_gen_128( OAES_CTX * ctx )
-{
-	return oaes_key_gen( ctx, 16 );
-}
-
-OAES_RET oaes_key_gen_192( OAES_CTX * ctx )
-{
-	return oaes_key_gen( ctx, 24 );
-}
-
-OAES_RET oaes_key_gen_256( OAES_CTX * ctx )
-{
-	return oaes_key_gen( ctx, 32 );
-}
-
-OAES_RET oaes_key_export( OAES_CTX * ctx,
-		uint8_t * data, size_t * data_len )
-{
-	size_t _data_len_in;
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-	
-	if( NULL == _ctx->key )
-		return OAES_RET_NOKEY;
-	
-	if( NULL == data_len )
-		return OAES_RET_ARG3;
-
-	_data_len_in = *data_len;
-	// data + header
-	*data_len = _ctx->key->data_len + OAES_BLOCK_SIZE;
-
-	if( NULL == data )
-		return OAES_RET_SUCCESS;
-	
-	if( _data_len_in < *data_len )
-		return OAES_RET_BUF;
-	
-	// header
-	memcpy( data, oaes_header, OAES_BLOCK_SIZE );
-	data[5] = 0x01;
-	data[7] = _ctx->key->data_len;
-	memcpy( data + OAES_BLOCK_SIZE, _ctx->key->data, _ctx->key->data_len );
-	
-	return OAES_RET_SUCCESS;
-}
-
-OAES_RET oaes_key_export_data( OAES_CTX * ctx,
-		uint8_t * data, size_t * data_len )
-{
-	size_t _data_len_in;
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-	
-	if( NULL == _ctx->key )
-		return OAES_RET_NOKEY;
-	
-	if( NULL == data_len )
-		return OAES_RET_ARG3;
-
-	_data_len_in = *data_len;
-	*data_len = _ctx->key->data_len;
-
-	if( NULL == data )
-		return OAES_RET_SUCCESS;
-	
-	if( _data_len_in < *data_len )
-		return OAES_RET_BUF;
-	
-	memcpy( data, _ctx->key->data, *data_len );
-	
-	return OAES_RET_SUCCESS;
-}
-
-OAES_RET oaes_key_import( OAES_CTX * ctx,
-		const uint8_t * data, size_t data_len )
-{
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	OAES_RET _rc = OAES_RET_SUCCESS;
-	int _key_length;
-	
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-	
-	if( NULL == data )
-		return OAES_RET_ARG2;
-	
-	switch( data_len )
-	{
-		case 16 + OAES_BLOCK_SIZE:
-		case 24 + OAES_BLOCK_SIZE:
-		case 32 + OAES_BLOCK_SIZE:
-			break;
-		default:
-			return OAES_RET_ARG3;
-	}
-	
-	// header
-	if( 0 != memcmp( data, oaes_header, 4 ) )
-		return OAES_RET_HEADER;
-
-	// header version
-	switch( data[4] )
-	{
-		case 0x01:
-			break;
-		default:
-			return OAES_RET_HEADER;
-	}
-	
-	// header type
-	switch( data[5] )
-	{
-		case 0x01:
-			break;
-		default:
-			return OAES_RET_HEADER;
-	}
-	
-	// options
-	_key_length = data[7];
-	switch( _key_length )
-	{
-		case 16:
-		case 24:
-		case 32:
-			break;
-		default:
-			return OAES_RET_HEADER;
-	}
-	
-	if( data_len != _key_length + OAES_BLOCK_SIZE )
-			return OAES_RET_ARG3;
-	
-	if( _ctx->key )
-		oaes_key_destroy( &(_ctx->key) );
-	
-	_ctx->key = (oaes_key *) calloc( sizeof( oaes_key ), 1 );
-	
-	if( NULL == _ctx->key )
-		return OAES_RET_MEM;
-	
-	_ctx->key->data_len = _key_length;
-	_ctx->key->data = (uint8_t *)
-			calloc( _key_length, sizeof( uint8_t ));
-	
-	if( NULL == _ctx->key->data )
-	{
-		oaes_key_destroy( &(_ctx->key) );
-		return OAES_RET_MEM;
-	}
-
-	memcpy( _ctx->key->data, data + OAES_BLOCK_SIZE, _key_length );
-	_rc = _rc || oaes_key_expand( ctx );
-	
-	if( _rc != OAES_RET_SUCCESS )
-	{
-		oaes_key_destroy( &(_ctx->key) );
-		return _rc;
-	}
-	
-	return OAES_RET_SUCCESS;
-}
-
-OAES_RET oaes_key_import_data( OAES_CTX * ctx,
-		const uint8_t * data, size_t data_len )
-{
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	OAES_RET _rc = OAES_RET_SUCCESS;
-	
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-	
-	if( NULL == data )
-		return OAES_RET_ARG2;
-	
-	switch( data_len )
-	{
-		case 16:
-		case 24:
-		case 32:
-			break;
-		default:
-			return OAES_RET_ARG3;
-	}
-	
-	if( _ctx->key )
-		oaes_key_destroy( &(_ctx->key) );
-	
-	_ctx->key = (oaes_key *) calloc( sizeof( oaes_key ), 1 );
-	
-	if( NULL == _ctx->key )
-		return OAES_RET_MEM;
-	
-	_ctx->key->data_len = data_len;
-	_ctx->key->data = (uint8_t *)
-			calloc( data_len, sizeof( uint8_t ));
-	
-	if( NULL == _ctx->key->data )
-	{
-		oaes_key_destroy( &(_ctx->key) );
-		return OAES_RET_MEM;
-	}
-
-	memcpy( _ctx->key->data, data, data_len );
-	_rc = _rc || oaes_key_expand( ctx );
-	
-	if( _rc != OAES_RET_SUCCESS )
-	{
-		oaes_key_destroy( &(_ctx->key) );
-		return _rc;
-	}
-	
-	return OAES_RET_SUCCESS;
-}
-
-OAES_CTX * oaes_alloc()
-{
-	oaes_ctx * _ctx = (oaes_ctx *) calloc( sizeof( oaes_ctx ), 1 );
-	
-	if( NULL == _ctx )
-		return NULL;
-
-#ifdef OAES_HAVE_ISAAC
-	{
-	  ub4 _i = 0;
-		char _seed[RANDSIZ + 1];
-		
-		_ctx->rctx = (randctx *) calloc( sizeof( randctx ), 1 );
-
-		if( NULL == _ctx->rctx )
-		{
-			free( _ctx );
-			return NULL;
-		}
-
-		oaes_get_seed( _seed );
-		memset( _ctx->rctx->randrsl, 0, RANDSIZ );
-		memcpy( _ctx->rctx->randrsl, _seed, RANDSIZ );
-		randinit( _ctx->rctx, TRUE);
-	}
-#else
-  //srand( oaes_get_seed() );
-#endif // OAES_HAVE_ISAAC
-
-	_ctx->key = NULL;
-	oaes_set_option( _ctx, OAES_OPTION_CBC, NULL );
-
-#ifdef OAES_DEBUG
-	_ctx->step_cb = NULL;
-	oaes_set_option( _ctx, OAES_OPTION_STEP_OFF, NULL );
-#endif // OAES_DEBUG
-
-	return (OAES_CTX *) _ctx;
-}
-
-OAES_RET oaes_free( OAES_CTX ** ctx )
-{
-	oaes_ctx ** _ctx = (oaes_ctx **) ctx;
-
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-	
-	if( NULL == *_ctx )
-		return OAES_RET_SUCCESS;
-	
-	if( (*_ctx)->key )
-		oaes_key_destroy( &((*_ctx)->key) );
-
-#ifdef OAES_HAVE_ISAAC
-	if( (*_ctx)->rctx )
-	{
-		free( (*_ctx)->rctx );
-		(*_ctx)->rctx = NULL;
-	}
-#endif // OAES_HAVE_ISAAC
-	
-	free( *_ctx );
-	*_ctx = NULL;
-
-	return OAES_RET_SUCCESS;
-}
-
-OAES_RET oaes_set_option( OAES_CTX * ctx,
-		OAES_OPTION option, const void * value )
-{
-	size_t _i;
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-
-	switch( option )
-	{
-		case OAES_OPTION_ECB:
-			_ctx->options &= ~OAES_OPTION_CBC;
-			memset( _ctx->iv, 0, OAES_BLOCK_SIZE );
-			break;
-
-		case OAES_OPTION_CBC:
-			_ctx->options &= ~OAES_OPTION_ECB;
-			if( value )
-				memcpy( _ctx->iv, value, OAES_BLOCK_SIZE );
-			else
-			{
-				for( _i = 0; _i < OAES_BLOCK_SIZE; _i++ )
-					_ctx->iv[_i] = (uint8_t) OAES_RAND(_ctx->rctx);
-			}
-			break;
-
-#ifdef OAES_DEBUG
-
-		case OAES_OPTION_STEP_ON:
-			if( value )
-			{
-				_ctx->options &= ~OAES_OPTION_STEP_OFF;
-				_ctx->step_cb = value;
-			}
-			else
-			{
-				_ctx->options &= ~OAES_OPTION_STEP_ON;
-				_ctx->options |= OAES_OPTION_STEP_OFF;
-				_ctx->step_cb = NULL;
-				return OAES_RET_ARG3;
-			}
-			break;
-
-		case OAES_OPTION_STEP_OFF:
-			_ctx->options &= ~OAES_OPTION_STEP_ON;
-			_ctx->step_cb = NULL;
-			break;
-
-#endif // OAES_DEBUG
-
-		default:
-			return OAES_RET_ARG2;
-	}
-
-	_ctx->options |= option;
-
-	return OAES_RET_SUCCESS;
-}
-
-static OAES_RET oaes_encrypt_block(
-		OAES_CTX * ctx, uint8_t * c, size_t c_len )
-{
-	size_t _i, _j;
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-	
-	if( NULL == c )
-		return OAES_RET_ARG2;
-	
-	if( c_len != OAES_BLOCK_SIZE )
-		return OAES_RET_ARG3;
-	
-	if( NULL == _ctx->key )
-		return OAES_RET_NOKEY;
-	
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-		_ctx->step_cb( c, "input", 1, NULL );
-#endif // OAES_DEBUG
-
-	// AddRoundKey(State, K0)
-	for( _i = 0; _i < c_len; _i++ )
-		c[_i] = c[_i] ^ _ctx->key->exp_data[_i];
-	
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-	{
-		_ctx->step_cb( _ctx->key->exp_data, "k_sch", 1, NULL );
-		_ctx->step_cb( c, "k_add", 1, NULL );
-	}
-#endif // OAES_DEBUG
-
-	// for round = 1 step 1 to Nr–1
-	for( _i = 1; _i < _ctx->key->num_keys - 1; _i++ )
-	{
-		// SubBytes(state)
-		for( _j = 0; _j < c_len; _j++ )
-			oaes_sub_byte( c + _j );
-
-#ifdef OAES_DEBUG
-		if( _ctx->step_cb )
-			_ctx->step_cb( c, "s_box", _i, NULL );
-#endif // OAES_DEBUG
-
-		// ShiftRows(state)
-		oaes_shift_rows( c );
-		
-#ifdef OAES_DEBUG
-		if( _ctx->step_cb )
-			_ctx->step_cb( c, "s_row", _i, NULL );
-#endif // OAES_DEBUG
-
-		// MixColumns(state)
-		oaes_mix_cols( c );
-		oaes_mix_cols( c + 4 );
-		oaes_mix_cols( c + 8 );
-		oaes_mix_cols( c + 12 );
-		
-#ifdef OAES_DEBUG
-		if( _ctx->step_cb )
-			_ctx->step_cb( c, "m_col", _i, NULL );
-#endif // OAES_DEBUG
-
-		// AddRoundKey(state, w[round*Nb, (round+1)*Nb-1])
-		for( _j = 0; _j < c_len; _j++ )
-			c[_j] = c[_j] ^
-					_ctx->key->exp_data[_i * OAES_RKEY_LEN * OAES_COL_LEN + _j];
-
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-	{
-		_ctx->step_cb( _ctx->key->exp_data + _i * OAES_RKEY_LEN * OAES_COL_LEN,
-				"k_sch", _i, NULL );
-		_ctx->step_cb( c, "k_add", _i, NULL );
-	}
-#endif // OAES_DEBUG
-
-	}
-	
-	// SubBytes(state)
-	for( _i = 0; _i < c_len; _i++ )
-		oaes_sub_byte( c + _i );
-	
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-		_ctx->step_cb( c, "s_box", _ctx->key->num_keys - 1, NULL );
-#endif // OAES_DEBUG
-
-	// ShiftRows(state)
-	oaes_shift_rows( c );
-
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-		_ctx->step_cb( c, "s_row", _ctx->key->num_keys - 1, NULL );
-#endif // OAES_DEBUG
-
-	// AddRoundKey(state, w[Nr*Nb, (Nr+1)*Nb-1])
-	for( _i = 0; _i < c_len; _i++ )
-		c[_i] = c[_i] ^ _ctx->key->exp_data[
-				( _ctx->key->num_keys - 1 ) * OAES_RKEY_LEN * OAES_COL_LEN + _i ];
-
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-	{
-		_ctx->step_cb( _ctx->key->exp_data +
-				( _ctx->key->num_keys - 1 ) * OAES_RKEY_LEN * OAES_COL_LEN,
-				"k_sch", _ctx->key->num_keys - 1, NULL );
-		_ctx->step_cb( c, "output", _ctx->key->num_keys - 1, NULL );
-	}
-#endif // OAES_DEBUG
-
-	return OAES_RET_SUCCESS;
-}
-
-static OAES_RET oaes_decrypt_block(
-		OAES_CTX * ctx, uint8_t * c, size_t c_len )
-{
-	size_t _i, _j;
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-	
-	if( NULL == c )
-		return OAES_RET_ARG2;
-	
-	if( c_len != OAES_BLOCK_SIZE )
-		return OAES_RET_ARG3;
-	
-	if( NULL == _ctx->key )
-		return OAES_RET_NOKEY;
-	
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-		_ctx->step_cb( c, "iinput", _ctx->key->num_keys - 1, NULL );
-#endif // OAES_DEBUG
-
-	// AddRoundKey(state, w[Nr*Nb, (Nr+1)*Nb-1])
-	for( _i = 0; _i < c_len; _i++ )
-		c[_i] = c[_i] ^ _ctx->key->exp_data[
-				( _ctx->key->num_keys - 1 ) * OAES_RKEY_LEN * OAES_COL_LEN + _i ];
-
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-	{
-		_ctx->step_cb( _ctx->key->exp_data +
-				( _ctx->key->num_keys - 1 ) * OAES_RKEY_LEN * OAES_COL_LEN,
-				"ik_sch", _ctx->key->num_keys - 1, NULL );
-		_ctx->step_cb( c, "ik_add", _ctx->key->num_keys - 1, NULL );
-	}
-#endif // OAES_DEBUG
-
-	for( _i = _ctx->key->num_keys - 2; _i > 0; _i-- )
-	{
-		// InvShiftRows(state)
-		oaes_inv_shift_rows( c );
-
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-		_ctx->step_cb( c, "is_row", _i, NULL );
-#endif // OAES_DEBUG
-
-		// InvSubBytes(state)
-		for( _j = 0; _j < c_len; _j++ )
-			oaes_inv_sub_byte( c + _j );
-	
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-		_ctx->step_cb( c, "is_box", _i, NULL );
-#endif // OAES_DEBUG
-
-		// AddRoundKey(state, w[round*Nb, (round+1)*Nb-1])
-		for( _j = 0; _j < c_len; _j++ )
-			c[_j] = c[_j] ^
-					_ctx->key->exp_data[_i * OAES_RKEY_LEN * OAES_COL_LEN + _j];
-		
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-	{
-		_ctx->step_cb( _ctx->key->exp_data + _i * OAES_RKEY_LEN * OAES_COL_LEN,
-				"ik_sch", _i, NULL );
-		_ctx->step_cb( c, "ik_add", _i, NULL );
-	}
-#endif // OAES_DEBUG
-
-		// InvMixColums(state)
-		oaes_inv_mix_cols( c );
-		oaes_inv_mix_cols( c + 4 );
-		oaes_inv_mix_cols( c + 8 );
-		oaes_inv_mix_cols( c + 12 );
-
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-		_ctx->step_cb( c, "im_col", _i, NULL );
-#endif // OAES_DEBUG
-
-	}
-
-	// InvShiftRows(state)
-	oaes_inv_shift_rows( c );
-
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-		_ctx->step_cb( c, "is_row", 1, NULL );
-#endif // OAES_DEBUG
-
-	// InvSubBytes(state)
-	for( _i = 0; _i < c_len; _i++ )
-		oaes_inv_sub_byte( c + _i );
-
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-		_ctx->step_cb( c, "is_box", 1, NULL );
-#endif // OAES_DEBUG
-
-	// AddRoundKey(state, w[0, Nb-1])
-	for( _i = 0; _i < c_len; _i++ )
-		c[_i] = c[_i] ^ _ctx->key->exp_data[_i];
-	
-#ifdef OAES_DEBUG
-	if( _ctx->step_cb )
-	{
-		_ctx->step_cb( _ctx->key->exp_data, "ik_sch", 1, NULL );
-		_ctx->step_cb( c, "ioutput", 1, NULL );
-	}
-#endif // OAES_DEBUG
-
-	return OAES_RET_SUCCESS;
-}
-
-OAES_RET oaes_encrypt( OAES_CTX * ctx,
-		const uint8_t * m, size_t m_len, uint8_t * c, size_t * c_len )
-{
-	size_t _i, _j, _c_len_in, _c_data_len;
-	size_t _pad_len = m_len % OAES_BLOCK_SIZE == 0 ?
-			0 : OAES_BLOCK_SIZE - m_len % OAES_BLOCK_SIZE;
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	OAES_RET _rc = OAES_RET_SUCCESS;
-	uint8_t _flags = _pad_len ? OAES_FLAG_PAD : 0;
-	
-	if( NULL == _ctx )
-		return OAES_RET_ARG1;
-	
-	if( NULL == m )
-		return OAES_RET_ARG2;
-	
-	if( NULL == c_len )
-		return OAES_RET_ARG5;
-	
-	_c_len_in = *c_len;
-	// data + pad
-	_c_data_len = m_len + _pad_len;
-	// header + iv + data + pad
-	*c_len = 2 * OAES_BLOCK_SIZE + m_len + _pad_len;
-
-	if( NULL == c )
-		return OAES_RET_SUCCESS;
-	
-	if( _c_len_in < *c_len )
-		return OAES_RET_BUF;
-	
-	if( NULL == _ctx->key )
-		return OAES_RET_NOKEY;
-	
-	// fill with random data first
-	for( _i = 0; _i < OAES_BLOCK_SIZE; _i++ )
-		c[_i] = (uint8_t) OAES_RAND(_ctx->rctx);
-	// header
-	memcpy(c + 6, &_ctx->options, sizeof(_ctx->options));
-	memcpy(c + 8, &_flags, sizeof(_flags));
-	// iv
-	memcpy(c + OAES_BLOCK_SIZE, _ctx->iv, OAES_BLOCK_SIZE );
-	// data
-	memcpy(c + 2 * OAES_BLOCK_SIZE, m, m_len );
-	
-	for( _i = 0; _i < _c_data_len; _i += OAES_BLOCK_SIZE )
-	{
-		uint8_t _block[OAES_BLOCK_SIZE];
-		size_t _block_size = min( m_len - _i, OAES_BLOCK_SIZE );
-
-		memcpy( _block, c + 2 * OAES_BLOCK_SIZE + _i, _block_size );
-		
-		// insert pad
-		for( _j = 0; _j < OAES_BLOCK_SIZE - _block_size; _j++ )
-			_block[ _block_size + _j ] = _j + 1;
-	
-		// CBC
-		if( _ctx->options & OAES_OPTION_CBC )
-		{
-			for( _j = 0; _j < OAES_BLOCK_SIZE; _j++ )
-				_block[_j] = _block[_j] ^ _ctx->iv[_j];
-		}
-
-		_rc = _rc ||
-				oaes_encrypt_block( ctx, _block, OAES_BLOCK_SIZE );
-		memcpy( c + 2 * OAES_BLOCK_SIZE + _i, _block, OAES_BLOCK_SIZE );
-		
-		if( _ctx->options & OAES_OPTION_CBC )
-			memcpy( _ctx->iv, _block, OAES_BLOCK_SIZE );
-	}
-	
-	return _rc;
-}
-
-OAES_RET oaes_decrypt( OAES_CTX * ctx,
-		const uint8_t * c, size_t c_len, uint8_t * m, size_t * m_len )
-{
-	size_t _i, _j, _m_len_in;
-	oaes_ctx * _ctx = (oaes_ctx *) ctx;
-	OAES_RET _rc = OAES_RET_SUCCESS;
-	uint8_t _iv[OAES_BLOCK_SIZE];
-	uint8_t _flags;
-	OAES_OPTION _options;
-	
-	if( NULL == ctx )
-		return OAES_RET_ARG1;
-	
-	if( NULL == c )
-		return OAES_RET_ARG2;
-	
-	if( c_len % OAES_BLOCK_SIZE )
-		return OAES_RET_ARG3;
-	
-	if( NULL == m_len )
-		return OAES_RET_ARG5;
-	
-	_m_len_in = *m_len;
-	*m_len = c_len - 2 * OAES_BLOCK_SIZE;
-	
-	if( NULL == m )
-		return OAES_RET_SUCCESS;
-	
-	if( _m_len_in < *m_len )
-		return OAES_RET_BUF;
-	
-	if( NULL == _ctx->key )
-		return OAES_RET_NOKEY;
-	
-	// options
-	memcpy(&_options, c + 6, sizeof(_options));
-	// validate that all options are valid
-	if( _options & ~(
-			  OAES_OPTION_ECB
-			| OAES_OPTION_CBC
-#ifdef OAES_DEBUG
-			| OAES_OPTION_STEP_ON
-			| OAES_OPTION_STEP_OFF
-#endif // OAES_DEBUG
-			) )
-		return OAES_RET_HEADER;
-	if( ( _options & OAES_OPTION_ECB ) &&
-			( _options & OAES_OPTION_CBC ) )
-		return OAES_RET_HEADER;
-	if( _options == OAES_OPTION_NONE )
-		return OAES_RET_HEADER;
-	
-	// flags
-	memcpy(&_flags, c + 8, sizeof(_flags));
-	// validate that all flags are valid
-	if( _flags & ~(
-			  OAES_FLAG_PAD
-			) )
-		return OAES_RET_HEADER;
-
-	// iv
-	memcpy( _iv, c + OAES_BLOCK_SIZE, OAES_BLOCK_SIZE);
-	// data + pad
-	memcpy( m, c + 2 * OAES_BLOCK_SIZE, *m_len );
-	
-	for( _i = 0; _i < *m_len; _i += OAES_BLOCK_SIZE )
-	{
-		if( ( _options & OAES_OPTION_CBC ) && _i > 0 )
-			memcpy( _iv, c + OAES_BLOCK_SIZE + _i, OAES_BLOCK_SIZE );
-		
-		_rc = _rc ||
-				oaes_decrypt_block( ctx, m + _i, min( *m_len - _i, OAES_BLOCK_SIZE ) );
-		
-		// CBC
-		if( _options & OAES_OPTION_CBC )
-		{
-			for( _j = 0; _j < OAES_BLOCK_SIZE; _j++ )
-				m[ _i + _j ] = m[ _i + _j ] ^ _iv[_j];
-		}
-	}
-	
-	// remove pad
-	if( _flags & OAES_FLAG_PAD )
-	{
-		int _is_pad = 1;
-		size_t _temp = (size_t) m[*m_len - 1];
-
-		if( _temp  <= 0x00 || _temp > 0x0f )
-			return OAES_RET_HEADER;
-		for( _i = 0; _i < _temp; _i++ )
-			if( m[*m_len - 1 - _i] != _temp - _i )
-				_is_pad = 0;
-		if( _is_pad )
-		{
-			memset( m + *m_len - _temp, 0, _temp );
-			*m_len -= _temp;
-		}
-		else
-			return OAES_RET_HEADER;
-	}
-	
-	return OAES_RET_SUCCESS;
-}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/oaes_lib.h firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/oaes_lib.h
--- firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/oaes_lib.h	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/oaes_lib.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,168 +0,0 @@
-/* 
- * ---------------------------------------------------------------------------
- * OpenAES License
- * ---------------------------------------------------------------------------
- * Copyright (c) 2013, Nabil S. Al Ramli, www.nalramli.com
- * All rights reserved.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 
- *   - Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *   - Redistributions in binary form must reproduce the above copyright
- *     notice, this list of conditions and the following disclaimer in the
- *     documentation and/or other materials provided with the distribution.
- * 
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- * ---------------------------------------------------------------------------
- */
-
-#ifndef _OAES_LIB_H
-#define _OAES_LIB_H
-
-#include "oaes_common.h"
-
-#ifdef __cplusplus 
-extern "C" {
-#endif
-
-#ifdef _WIN32
-#	ifdef OAES_SHARED
-#		ifdef oaes_lib_EXPORTS
-#			define OAES_API __declspec(dllexport)
-#		else
-#			define OAES_API __declspec(dllimport)
-#		endif
-#	else
-#		define OAES_API
-#	endif
-#else
-#	define OAES_API
-#endif // WIN32
-
-#define OAES_BLOCK_SIZE 16
-
-typedef void OAES_CTX;
-
-/*
- * oaes_set_option() takes one of these values for its [option] parameter
- * some options accept either an optional or a required [value] parameter
- */
-// no option
-#define OAES_OPTION_NONE 0
-// enable ECB mode, disable CBC mode
-#define OAES_OPTION_ECB 1
-// enable CBC mode, disable ECB mode
-// value is optional, may pass uint8_t iv[OAES_BLOCK_SIZE] to specify
-// the value of the initialization vector, iv
-#define OAES_OPTION_CBC 2
-
-#ifdef OAES_DEBUG
-typedef int ( * oaes_step_cb ) (
-		const uint8_t state[OAES_BLOCK_SIZE],
-		const char * step_name,
-		int step_count,
-		void * user_data );
-// enable state stepping mode
-// value is required, must pass oaes_step_cb to receive the state at each step
-#define OAES_OPTION_STEP_ON 4
-// disable state stepping mode
-#define OAES_OPTION_STEP_OFF 8
-#endif // OAES_DEBUG
-
-typedef uint16_t OAES_OPTION;
-
-/*
- * // usage:
- * 
- * OAES_CTX * ctx = oaes_alloc();
- * .
- * .
- * .
- * {
- *   oaes_gen_key_xxx( ctx );
- *   {
- *     oaes_key_export( ctx, _buf, &_buf_len );
- *     // or
- *     oaes_key_export_data( ctx, _buf, &_buf_len );\
- *   }
- * }
- * // or
- * {
- *   oaes_key_import( ctx, _buf, _buf_len );
- *   // or
- *   oaes_key_import_data( ctx, _buf, _buf_len );
- * }
- * .
- * .
- * .
- * oaes_encrypt( ctx, m, m_len, c, &c_len );
- * .
- * .
- * .
- * oaes_decrypt( ctx, c, c_len, m, &m_len );
- * .
- * .
- * .
- * oaes_free( &ctx );
- */
-
-OAES_API OAES_CTX * oaes_alloc();
-
-OAES_API OAES_RET oaes_free( OAES_CTX ** ctx );
-
-OAES_API OAES_RET oaes_set_option( OAES_CTX * ctx,
-		OAES_OPTION option, const void * value );
-
-OAES_API OAES_RET oaes_key_gen_128( OAES_CTX * ctx );
-
-OAES_API OAES_RET oaes_key_gen_192( OAES_CTX * ctx );
-
-OAES_API OAES_RET oaes_key_gen_256( OAES_CTX * ctx );
-
-// export key with header information
-// set data == NULL to get the required data_len
-OAES_API OAES_RET oaes_key_export( OAES_CTX * ctx,
-		uint8_t * data, size_t * data_len );
-
-// directly export the data from key
-// set data == NULL to get the required data_len
-OAES_API OAES_RET oaes_key_export_data( OAES_CTX * ctx,
-		uint8_t * data, size_t * data_len );
-
-// import key with header information
-OAES_API OAES_RET oaes_key_import( OAES_CTX * ctx,
-		const uint8_t * data, size_t data_len );
-
-// directly import data into key
-OAES_API OAES_RET oaes_key_import_data( OAES_CTX * ctx,
-		const uint8_t * data, size_t data_len );
-
-// set c == NULL to get the required c_len
-OAES_API OAES_RET oaes_encrypt( OAES_CTX * ctx,
-		const uint8_t * m, size_t m_len, uint8_t * c, size_t * c_len );
-
-// set m == NULL to get the required m_len
-OAES_API OAES_RET oaes_decrypt( OAES_CTX * ctx,
-		const uint8_t * c, size_t c_len, uint8_t * m, size_t * m_len );
-
-// set buf == NULL to get the required buf_len
-OAES_API OAES_RET oaes_sprintf(
-		char * buf, size_t * buf_len, const uint8_t * data, size_t data_len );
-
-#ifdef __cplusplus 
-}
-#endif
-
-#endif // _OAES_LIB_H
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/standard.h firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/standard.h
--- firefox-trunk-71.0~a1~hg20190913r492975/media/gmp-clearkey/0.1/openaes/standard.h	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/gmp-clearkey/0.1/openaes/standard.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
-------------------------------------------------------------------------------
-Standard definitions and types, Bob Jenkins
-------------------------------------------------------------------------------
-*/
-#ifndef STANDARD
-# define STANDARD
-# ifndef STDIO
-#  include <stdio.h>
-#  define STDIO
-# endif
-# ifndef STDDEF
-#  include <stddef.h>
-#  define STDDEF
-# endif
-typedef  unsigned long long  ub8;
-#define UB8MAXVAL 0xffffffffffffffffLL
-#define UB8BITS 64
-typedef    signed long long  sb8;
-#define SB8MAXVAL 0x7fffffffffffffffLL
-typedef  unsigned long  int  ub4;   /* unsigned 4-byte quantities */
-#define UB4MAXVAL 0xffffffff
-typedef    signed long  int  sb4;
-#define UB4BITS 32
-#define SB4MAXVAL 0x7fffffff
-typedef  unsigned short int  ub2;
-#define UB2MAXVAL 0xffff
-#define UB2BITS 16
-typedef    signed short int  sb2;
-#define SB2MAXVAL 0x7fff
-typedef  unsigned       char ub1;
-#define UB1MAXVAL 0xff
-#define UB1BITS 8
-typedef    signed       char sb1;   /* signed 1-byte quantities */
-#define SB1MAXVAL 0x7f
-typedef                 int  word;  /* fastest type available */
-
-#define bis(target,mask)  ((target) |=  (mask))
-#define bic(target,mask)  ((target) &= ~(mask))
-#define bit(target,mask)  ((target) &   (mask))
-// #ifndef min
-// # define min(a,b) (((a)<(b)) ? (a) : (b))
-// #endif /* min */
-// #ifndef max
-// # define max(a,b) (((a)<(b)) ? (b) : (a))
-// #endif /* max */
-#ifndef align
-# define align(a) (((ub4)a+(sizeof(void *)-1))&(~(sizeof(void *)-1)))
-#endif /* align */
-// #ifndef abs
-// # define abs(a)   (((a)>0) ? (a) : -(a))
-// #endif
-#define TRUE  1
-#define FALSE 0
-#define SUCCESS 0  /* 1 on VAX */
-
-#endif /* STANDARD */
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp firefox-trunk-71.0~a1~hg20190915r493291/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/webrtc/signaling/src/media-conduit/WebrtcMediaCodecVP8VideoCodec.cpp	2019-09-15 11:33:20.000000000 +0000
@@ -1028,7 +1028,7 @@
   if (!mJavaEncoder) {
     return WEBRTC_VIDEO_CODEC_UNINITIALIZED;
   }
-  mJavaEncoder->SetRates(newBitRate);
+  mJavaEncoder->SetBitrate(newBitRate * 1000);
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/webrtc/signaling/src/media-conduit/WebrtcMediaDataEncoderCodec.cpp firefox-trunk-71.0~a1~hg20190915r493291/media/webrtc/signaling/src/media-conduit/WebrtcMediaDataEncoderCodec.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/media/webrtc/signaling/src/media-conduit/WebrtcMediaDataEncoderCodec.cpp	2019-09-13 05:13:24.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/webrtc/signaling/src/media-conduit/WebrtcMediaDataEncoderCodec.cpp	2019-09-15 11:33:19.000000000 +0000
@@ -13,6 +13,7 @@
 #include "mozilla/Span.h"
 #include "mozilla/gfx/Point.h"
 #include "mozilla/media/MediaUtils.h"
+#include "webrtc/media/base/mediaconstants.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 namespace mozilla {
@@ -193,7 +194,7 @@
   image->CopyData(yCbCrData);
 
   RefPtr<MediaData> data = VideoData::CreateFromImage(
-      image->GetSize(), 0, TimeUnit::FromMicroseconds(aFrame.timestamp()),
+      image->GetSize(), 0, TimeUnit::FromMicroseconds(aFrame.timestamp_us()),
       TimeUnit::FromSeconds(1.0 / mMaxFrameRate), image, aIsKeyFrame,
       TimeUnit::FromMicroseconds(aFrame.timestamp()));
   return data.forget();
@@ -235,11 +236,10 @@
 void WebrtcMediaDataEncoder::ProcessEncode(
     const RefPtr<MediaData>& aInputData) {
   const gfx::IntSize display = aInputData->As<VideoData>()->mDisplay;
-  const uint32_t timestamp = aInputData->mTime.ToMicroseconds();
   mEncoder->Encode(aInputData)
       ->Then(
           OwnerThread(), __func__,
-          [display, timestamp, self = RefPtr<WebrtcMediaDataEncoder>(this),
+          [display, self = RefPtr<WebrtcMediaDataEncoder>(this),
            // capture this for printing address in LOG.
            this](const MediaDataEncoder::EncodedData& aData) {
             // The encoder haven't finished encoding yet.
@@ -254,7 +254,14 @@
                                          frame->Size(), frame->Size());
               image._encodedWidth = display.width;
               image._encodedHeight = display.height;
-              image._timeStamp = timestamp;
+              CheckedInt64 time =
+                  TimeUnitToFrames(frame->mTime, cricket::kVideoCodecClockrate);
+              if (!time.isValid()) {
+                mError = MediaResult(NS_ERROR_DOM_MEDIA_FATAL_ERR,
+                                     "invalid timestamp from encoder");
+                return;
+              }
+              image._timeStamp = time.value();
               image._frameType = frame->mKeyframe
                                      ? webrtc::FrameType::kVideoFrameKey
                                      : webrtc::FrameType::kVideoFrameDelta;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp firefox-trunk-71.0~a1~hg20190915r493291/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp	2019-09-13 05:13:23.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/webrtc/signaling/src/peerconnection/MediaTransportHandler.cpp	2019-09-15 11:33:20.000000000 +0000
@@ -233,6 +233,9 @@
   if (!mStsThread) {
     MOZ_CRASH();
   }
+
+  RLogConnector::CreateInstance();
+
   CSFLogDebug(LOGTAG, "%s done", __func__);
 
   // We do not set up mDNSService here, because we are not running on main (we
@@ -1080,9 +1083,6 @@
 }
 
 void MediaTransportHandlerSTS::EnterPrivateMode() {
-  // Do this from calling thread, because that's what we do in CreateIceCtx...
-  RLogConnector::CreateInstance();
-
   if (!mStsThread->IsOnCurrentThread()) {
     mStsThread->Dispatch(
         WrapRunnable(RefPtr<MediaTransportHandlerSTS>(this),
@@ -1095,9 +1095,6 @@
 }
 
 void MediaTransportHandlerSTS::ExitPrivateMode() {
-  // Do this from calling thread, because that's what we do in CreateIceCtx...
-  RLogConnector::CreateInstance();
-
   if (!mStsThread->IsOnCurrentThread()) {
     mStsThread->Dispatch(
         WrapRunnable(RefPtr<MediaTransportHandlerSTS>(this),
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp firefox-trunk-71.0~a1~hg20190915r493291/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp	2019-09-13 05:13:24.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp	2019-09-15 11:33:19.000000000 +0000
@@ -266,7 +266,11 @@
   return NS_OK;
 }
 
-void TransceiverImpl::ResetSync() { mConduit->SetSyncGroup(""); }
+void TransceiverImpl::ResetSync() {
+  if (mConduit) {
+    mConduit->SetSyncGroup("");
+  }
+}
 
 nsresult TransceiverImpl::SyncWithMatchingVideoConduits(
     std::vector<RefPtr<TransceiverImpl>>& transceivers) {
@@ -287,6 +291,10 @@
                             mJsepTransceiver->mRecvTrack.GetStreamIds().end());
 
   for (RefPtr<TransceiverImpl>& transceiver : transceivers) {
+    if (!transceiver->IsValid()) {
+      continue;
+    }
+
     if (!transceiver->IsVideo()) {
       // |this| is an audio transceiver, so we skip other audio transceivers
       continue;
@@ -318,7 +326,7 @@
 }
 
 bool TransceiverImpl::ConduitHasPluginID(uint64_t aPluginID) {
-  return mConduit->CodecPluginID() == aPluginID;
+  return mConduit ? mConduit->CodecPluginID() == aPluginID : false;
 }
 
 bool TransceiverImpl::HasSendTrack(
@@ -629,6 +637,8 @@
 }
 
 nsresult TransceiverImpl::UpdateAudioConduit() {
+  MOZ_ASSERT(IsValid());
+
   RefPtr<AudioSessionConduit> conduit =
       static_cast<AudioSessionConduit*>(mConduit.get());
 
@@ -780,6 +790,8 @@
 }
 
 nsresult TransceiverImpl::UpdateVideoConduit() {
+  MOZ_ASSERT(IsValid());
+
   RefPtr<VideoSessionConduit> conduit =
       static_cast<VideoSessionConduit*>(mConduit.get());
 
@@ -919,6 +931,10 @@
 void TransceiverImpl::UpdateConduitRtpExtmap(
     const JsepTrackNegotiatedDetails& aDetails,
     const LocalDirection aDirection) {
+  if (!IsValid()) {
+    return;
+  }
+
   std::vector<webrtc::RtpExtension> extmaps;
   // @@NG read extmap from track
   aDetails.ForEachRTPHeaderExtension(
@@ -940,6 +956,11 @@
   // Make sure that stats queries stop working on this transceiver.
   UpdateSendTrack(nullptr);
   mHaveStartedReceiving = false;
+
+  if (mConduit) {
+    mConduit->DeleteStreams();
+  }
+  mConduit = nullptr;
 }
 
 bool TransceiverImpl::IsVideo() const {
@@ -949,9 +970,10 @@
 void TransceiverImpl::GetRtpSources(
     const int64_t aTimeNow,
     nsTArray<dom::RTCRtpSourceEntry>& outSources) const {
-  if (IsVideo()) {
+  if (!IsValid() || IsVideo()) {
     return;
   }
+
   WebrtcAudioConduit* audio_conduit =
       static_cast<WebrtcAudioConduit*>(mConduit.get());
   audio_conduit->GetRtpSources(aTimeNow, outSources);
@@ -961,7 +983,7 @@
                                                             int64_t aTimestamp,
                                                             bool aHasLevel,
                                                             uint8_t aLevel) {
-  if (IsVideo()) {
+  if (!IsValid() || IsVideo()) {
     return;
   }
   WebrtcAudioConduit* audio_conduit =
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/mfbt/tests/TestWeakPtr.cpp firefox-trunk-71.0~a1~hg20190915r493291/mfbt/tests/TestWeakPtr.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/mfbt/tests/TestWeakPtr.cpp	2019-09-13 05:13:24.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/mfbt/tests/TestWeakPtr.cpp	2019-09-15 11:33:21.000000000 +0000
@@ -9,6 +9,16 @@
 using mozilla::SupportsWeakPtr;
 using mozilla::WeakPtr;
 
+static char IamB[] = "B";
+static char IamC[] = "C";
+static char IamD[] = "D";
+static char IamE[] = "E";
+
+class B : public SupportsWeakPtr<B> {
+ public:
+  char const* whoAmI() const { return IamB; }
+};
+
 // To have a class C support weak pointers, inherit from SupportsWeakPtr<C>.
 class C : public SupportsWeakPtr<C> {
  public:
@@ -24,6 +34,8 @@
     mNum = 0xDEAD;
   }
 
+  char const* whoAmI() const { return IamC; }
+
   void act() {}
 
   bool isConst() { return false; }
@@ -31,6 +43,19 @@
   bool isConst() const { return true; }
 };
 
+// Supports weakptr for two base classes (B and C) and itself (D)
+class D : public B, public C, public SupportsWeakPtr<D> {
+ public:
+  char const* whoAmI() const { return IamD; }
+};
+
+// Derived from a class that supports weakptr, but doesn't implement itself
+// To check upcast works as expected
+class E : public D {
+ public:
+  char const* whoAmI() const { return IamE; }
+};
+
 bool isConst(C*) { return false; }
 
 bool isConst(const C*) { return true; }
@@ -110,4 +135,39 @@
 
   delete c2;
   MOZ_RELEASE_ASSERT(!w2, "Deleting an object should clear WeakPtr's to it.");
+
+  // Testing multiple base classes weak pointer support
+  D* d = new D;
+  WeakPtr<D> dd = d;
+  WeakPtr<const D> ddconst = d;
+  WeakPtr<C> dc = d;
+  WeakPtr<const C> dcconst = d;
+  WeakPtr<B> db = d;
+  WeakPtr<const B> dbconst = d;
+
+  MOZ_RELEASE_ASSERT(dd->whoAmI() == IamD);
+  MOZ_RELEASE_ASSERT(ddconst->whoAmI() == IamD);
+  MOZ_RELEASE_ASSERT(dc->whoAmI() == IamC);
+  MOZ_RELEASE_ASSERT(dcconst->whoAmI() == IamC);
+  MOZ_RELEASE_ASSERT(db->whoAmI() == IamB);
+  MOZ_RELEASE_ASSERT(dbconst->whoAmI() == IamB);
+
+  delete d;
+
+  MOZ_RELEASE_ASSERT(!dd);
+  MOZ_RELEASE_ASSERT(!ddconst);
+  MOZ_RELEASE_ASSERT(!dc);
+  MOZ_RELEASE_ASSERT(!dcconst);
+  MOZ_RELEASE_ASSERT(!db);
+  MOZ_RELEASE_ASSERT(!dbconst);
+
+  // Check that we correctly upcast to the base class supporting weakptr
+  E* e = new E;
+  WeakPtr<D> ed = e;
+
+  MOZ_RELEASE_ASSERT(ed->whoAmI() == IamD);
+
+  delete e;
+
+  MOZ_RELEASE_ASSERT(!ed);
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/mfbt/WeakPtr.h firefox-trunk-71.0~a1~hg20190915r493291/mfbt/WeakPtr.h
--- firefox-trunk-71.0~a1~hg20190913r492975/mfbt/WeakPtr.h	2019-09-13 05:13:24.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/mfbt/WeakPtr.h	2019-09-15 11:33:21.000000000 +0000
@@ -164,7 +164,7 @@
 // This can live beyond the lifetime of the class derived from
 // SupportsWeakPtr.
 template <class T>
-class WeakReference : public ::mozilla::RefCounted<WeakReference<T> > {
+class WeakReference : public ::mozilla::RefCounted<WeakReference<T>> {
  public:
   explicit WeakReference(T* p) : mPtr(p) {
     MOZ_WEAKPTR_INIT_THREAD_SAFETY_CHECK();
@@ -239,6 +239,7 @@
 template <typename T>
 class WeakPtr {
   typedef detail::WeakReference<T> WeakReference;
+  typedef typename RemoveConst<T>::Type NonConstT;
 
  public:
   WeakPtr& operator=(const WeakPtr& aOther) {
@@ -252,7 +253,15 @@
     *this = aOther;
   }
 
-  WeakPtr& operator=(T* aOther) {
+  WeakPtr& operator=(decltype(nullptr)) {
+    if (!mRef || mRef->get()) {
+      // Ensure that mRef is dereferenceable in the uninitialized state.
+      mRef = new WeakReference(nullptr);
+    }
+    return *this;
+  }
+
+  WeakPtr& operator=(SupportsWeakPtr<NonConstT> const* aOther) {
     if (aOther) {
       *this = aOther->SelfReferencingWeakPtr();
     } else if (!mRef || mRef->get()) {
@@ -264,11 +273,20 @@
     return *this;
   }
 
-  MOZ_IMPLICIT WeakPtr(T* aOther) {
-    *this = aOther;
-    MOZ_WEAKPTR_ASSERT_THREAD_SAFETY_DELEGATED(mRef);
+  WeakPtr& operator=(SupportsWeakPtr<NonConstT>* aOther) {
+    if (aOther) {
+      *this = aOther->SelfReferencingWeakPtr();
+    } else if (!mRef || mRef->get()) {
+      // Ensure that mRef is dereferenceable in the uninitialized state.
+      mRef = new WeakReference(nullptr);
+    }
+    // The thread safety check happens inside SelfReferencingWeakPtr
+    // or is initialized in the WeakReference constructor.
+    return *this;
   }
 
+  MOZ_IMPLICIT WeakPtr(T* aOther) { *this = aOther; }
+
   // Ensure that mRef is dereferenceable in the uninitialized state.
   WeakPtr() : mRef(new WeakReference(nullptr)) {}
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/media/ICodec.aidl firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/media/ICodec.aidl
--- firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/media/ICodec.aidl	2019-09-13 05:13:24.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/aidl/org/mozilla/gecko/media/ICodec.aidl	2019-09-15 11:33:20.000000000 +0000
@@ -29,5 +29,5 @@
     SampleBuffer getOutputBuffer(int id);
 
     void releaseOutput(in Sample sample, in boolean render);
-    oneway void setRates(in int newBitRate);
+    oneway void setBitrate(in int bps);
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/AsyncCodec.java firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/AsyncCodec.java
--- firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/AsyncCodec.java	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/AsyncCodec.java	2019-09-15 11:33:20.000000000 +0000
@@ -36,7 +36,7 @@
     public abstract ByteBuffer getInputBuffer(int index);
     public abstract ByteBuffer getOutputBuffer(int index);
     public abstract void queueInputBuffer(int index, int offset, int size, long presentationTimeUs, int flags);
-    public abstract void setRates(int newBitRate);
+    public abstract void setBitrate(int bps);
     public abstract void queueSecureInputBuffer(int index, int offset, CryptoInfo info, long presentationTimeUs, int flags);
     public abstract void releaseOutputBuffer(int index, boolean render);
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/Codec.java firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/Codec.java
--- firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/Codec.java	2019-09-13 05:13:24.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/Codec.java	2019-09-15 11:33:20.000000000 +0000
@@ -612,9 +612,9 @@
     }
 
     @Override
-    public synchronized void setRates(final int newBitRate) {
+    public synchronized void setBitrate(final int bps) {
         try {
-            mCodec.setRates(newBitRate);
+            mCodec.setBitrate(bps);
         } catch (Exception e) {
             reportError(Error.FATAL, e);
         }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/CodecProxy.java firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/CodecProxy.java
--- firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/CodecProxy.java	2019-09-13 05:13:24.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/CodecProxy.java	2019-09-15 11:33:21.000000000 +0000
@@ -361,7 +361,7 @@
     }
 
     @WrapForJNI
-    public synchronized boolean setRates(final int newBitRate) {
+    public synchronized boolean setBitrate(final int bps) {
         if (!mIsEncoder) {
             Log.w(LOGTAG, "this api is encoder-only");
             return false;
@@ -378,9 +378,9 @@
         }
 
         try {
-            mRemote.setRates(newBitRate);
+            mRemote.setBitrate(bps);
         } catch (RemoteException e) {
-            Log.e(LOGTAG, "remote fail to set rates:" + newBitRate);
+            Log.e(LOGTAG, "remote fail to set rates:" + bps);
             e.printStackTrace();
         }
         return true;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/JellyBeanAsyncCodec.java firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/JellyBeanAsyncCodec.java
--- firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/JellyBeanAsyncCodec.java	2019-09-13 05:13:24.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/JellyBeanAsyncCodec.java	2019-09-15 11:33:20.000000000 +0000
@@ -355,10 +355,10 @@
     }
 
     @Override
-    public final void setRates(final int newBitRate) {
+    public final void setBitrate(final int bps) {
         if (android.os.Build.VERSION.SDK_INT >= 19) {
             Bundle params = new Bundle();
-            params.putInt(MediaCodec.PARAMETER_KEY_VIDEO_BITRATE, newBitRate * 1000);
+            params.putInt(MediaCodec.PARAMETER_KEY_VIDEO_BITRATE, bps);
             mCodec.setParameters(params);
         }
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/LollipopAsyncCodec.java firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/LollipopAsyncCodec.java
--- firefox-trunk-71.0~a1~hg20190913r492975/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/LollipopAsyncCodec.java	2019-09-13 05:13:24.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/mobile/android/geckoview/src/main/java/org/mozilla/gecko/media/LollipopAsyncCodec.java	2019-09-15 11:33:21.000000000 +0000
@@ -190,9 +190,9 @@
     }
 
     @Override
-    public void setRates(final int newBitRate) {
+    public void setBitrate(final int bps) {
         final Bundle params = new Bundle();
-        params.putInt(MediaCodec.PARAMETER_KEY_VIDEO_BITRATE, newBitRate * 1000);
+        params.putInt(MediaCodec.PARAMETER_KEY_VIDEO_BITRATE, bps);
         mCodec.setParameters(params);
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/modules/libpref/init/StaticPrefList.yaml firefox-trunk-71.0~a1~hg20190915r493291/modules/libpref/init/StaticPrefList.yaml
--- firefox-trunk-71.0~a1~hg20190913r492975/modules/libpref/init/StaticPrefList.yaml	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/modules/libpref/init/StaticPrefList.yaml	2019-09-15 11:33:21.000000000 +0000
@@ -3739,7 +3739,7 @@
 # Maximum size for the surface cache, in kilobytes.
 - name: image.mem.surfacecache.max_size_kb
   type: uint32_t
-  value: 1024 * 1024
+  value: 2024 * 1024
   mirror: once
 
 # Minimum timeout for expiring unused images from the surface cache, in
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/netwerk/base/nsStandardURL.cpp firefox-trunk-71.0~a1~hg20190915r493291/netwerk/base/nsStandardURL.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/netwerk/base/nsStandardURL.cpp	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/netwerk/base/nsStandardURL.cpp	2019-09-15 11:33:21.000000000 +0000
@@ -215,11 +215,9 @@
   mParser = net_GetStdURLParser();
 
 #ifdef DEBUG_DUMP_URLS_AT_SHUTDOWN
-  if (NS_IsMainThread()) {
-    if (aTrackURL) {
-      StaticMutexAutoLock lock(gAllURLsMutex);
-      gAllURLs.insertBack(this);
-    }
+  if (aTrackURL) {
+    StaticMutexAutoLock lock(gAllURLsMutex);
+    gAllURLs.insertBack(this);
   }
 #endif
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/netwerk/dns/tests/unit/xpcshell.ini firefox-trunk-71.0~a1~hg20190915r493291/netwerk/dns/tests/unit/xpcshell.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/netwerk/dns/tests/unit/xpcshell.ini	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/netwerk/dns/tests/unit/xpcshell.ini	2019-09-15 11:33:20.000000000 +0000
@@ -1,7 +1,10 @@
 [DEFAULT]
 head = ../../../../services/common/tests/unit/head_global.js ../../../../services/common/tests/unit/head_helpers.js
 firefox-appdir = browser
-support-files = data/**
+support-files =
+  data/**
+  !/services/common/tests/unit/head_global.js
+  !/services/common/tests/unit/head_helpers.js
 
 [test_PublicSuffixList.js]
 [test_nsEffectiveTLDService_Reload_DAFSA.js]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/netwerk/ipc/SocketProcessParent.h firefox-trunk-71.0~a1~hg20190915r493291/netwerk/ipc/SocketProcessParent.h
--- firefox-trunk-71.0~a1~hg20190913r492975/netwerk/ipc/SocketProcessParent.h	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/netwerk/ipc/SocketProcessParent.h	2019-09-15 11:33:20.000000000 +0000
@@ -29,7 +29,7 @@
 // by SocketProcessHost.
 class SocketProcessParent final
     : public PSocketProcessParent,
-      public ipc::CrashReporterHelper<GeckoProcessType_Content> {
+      public ipc::CrashReporterHelper<GeckoProcessType_Socket> {
  public:
   friend class SocketProcessHost;
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/netwerk/protocol/ftp/FTPChannelParent.cpp firefox-trunk-71.0~a1~hg20190915r493291/netwerk/protocol/ftp/FTPChannelParent.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/netwerk/protocol/ftp/FTPChannelParent.cpp	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/netwerk/protocol/ftp/FTPChannelParent.cpp	2019-09-15 11:33:20.000000000 +0000
@@ -408,6 +408,8 @@
   chan->GetContentLength(&contentLength);
   nsCString contentType;
   chan->GetContentType(contentType);
+  nsresult channelStatus = NS_OK;
+  chan->GetStatus(&channelStatus);
 
   nsCString entityID;
   nsCOMPtr<nsIResumableChannel> resChan = do_QueryInterface(aRequest);
@@ -432,8 +434,9 @@
   chan->GetURI(getter_AddRefs(uri));
   SerializeURI(uri, uriparam);
 
-  if (mIPCClosed || !SendOnStartRequest(mStatus, contentLength, contentType,
-                                        lastModified, entityID, uriparam)) {
+  if (mIPCClosed ||
+      !SendOnStartRequest(channelStatus, contentLength, contentType,
+                          lastModified, entityID, uriparam)) {
     return NS_ERROR_UNEXPECTED;
   }
 
@@ -479,7 +482,10 @@
   nsresult rv = NS_ReadInputStreamToString(aInputStream, data, aCount);
   if (NS_FAILED(rv)) return rv;
 
-  if (mIPCClosed || !SendOnDataAvailable(mStatus, data, aOffset, aCount))
+  nsresult channelStatus = NS_OK;
+  mChannel->GetStatus(&channelStatus);
+
+  if (mIPCClosed || !SendOnDataAvailable(channelStatus, data, aOffset, aCount))
     return NS_ERROR_UNEXPECTED;
 
   return NS_OK;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/netwerk/protocol/http/HttpBaseChannel.h firefox-trunk-71.0~a1~hg20190915r493291/netwerk/protocol/http/HttpBaseChannel.h
--- firefox-trunk-71.0~a1~hg20190913r492975/netwerk/protocol/http/HttpBaseChannel.h	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/netwerk/protocol/http/HttpBaseChannel.h	2019-09-15 11:33:21.000000000 +0000
@@ -249,6 +249,10 @@
 
   using nsIHttpChannel::IsThirdPartyTrackingResource;
 
+  virtual void SetSource(UniqueProfilerBacktrace aSource) override {
+    mSource = std::move(aSource);
+  }
+
   // nsIHttpChannelInternal
   NS_IMETHOD GetDocumentURI(nsIURI** aDocumentURI) override;
   NS_IMETHOD SetDocumentURI(nsIURI* aDocumentURI) override;
@@ -721,6 +725,8 @@
   Atomic<uint32_t, ReleaseAcquire> mThirdPartyClassificationFlags;
   Atomic<uint32_t, ReleaseAcquire> mFlashPluginState;
 
+  UniqueProfilerBacktrace mSource;
+
   uint32_t mLoadFlags;
   uint32_t mCaps;
   uint32_t mClassOfService;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/netwerk/protocol/http/HttpChannelChild.cpp firefox-trunk-71.0~a1~hg20190915r493291/netwerk/protocol/http/HttpChannelChild.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/netwerk/protocol/http/HttpChannelChild.cpp	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/netwerk/protocol/http/HttpChannelChild.cpp	2019-09-15 11:33:21.000000000 +0000
@@ -1117,10 +1117,10 @@
   if (profiler_is_active()) {
     int32_t priority = PRIORITY_NORMAL;
     GetPriority(&priority);
-    profiler_add_network_marker(mURI, priority, mChannelId,
-                                NetworkLoadType::LOAD_STOP, mLastStatusReported,
-                                TimeStamp::Now(), mTransferSize, kCacheUnknown,
-                                &mTransactionTimings);
+    profiler_add_network_marker(
+        mURI, priority, mChannelId, NetworkLoadType::LOAD_STOP,
+        mLastStatusReported, TimeStamp::Now(), mTransferSize, kCacheUnknown,
+        &mTransactionTimings, nullptr, std::move(mSource));
   }
 #endif
 
@@ -1785,10 +1785,10 @@
   nsCOMPtr<nsIURI> uri = DeserializeURI(newOriginalURI);
 
   mTransactionTimings = timing;
-  PROFILER_ADD_NETWORK_MARKER(mURI, mPriority, mChannelId,
-                              NetworkLoadType::LOAD_REDIRECT,
-                              mLastStatusReported, TimeStamp::Now(), 0,
-                              kCacheUnknown, &mTransactionTimings, uri);
+  PROFILER_ADD_NETWORK_MARKER(
+      mURI, mPriority, mChannelId, NetworkLoadType::LOAD_REDIRECT,
+      mLastStatusReported, TimeStamp::Now(), 0, kCacheUnknown,
+      &mTransactionTimings, uri, std::move(mSource));
 
   if (!securityInfoSerialization.IsEmpty()) {
     rv = NS_DeserializeObject(securityInfoSerialization,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/netwerk/protocol/http/nsHttpChannel.cpp firefox-trunk-71.0~a1~hg20190915r493291/netwerk/protocol/http/nsHttpChannel.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/netwerk/protocol/http/nsHttpChannel.cpp	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/netwerk/protocol/http/nsHttpChannel.cpp	2019-09-15 11:33:21.000000000 +0000
@@ -5932,7 +5932,7 @@
     profiler_add_network_marker(
         mURI, priority, mChannelId, NetworkLoadType::LOAD_REDIRECT,
         mLastStatusReported, TimeStamp::Now(), mLogicalOffset,
-        mCacheDisposition, &timings, mRedirectURI);
+        mCacheDisposition, &timings, mRedirectURI, std::move(mSource));
   }
 #endif
 
@@ -6361,9 +6361,10 @@
   mLastStatusReported =
       TimeStamp::Now();  // in case we enable the profiler after AsyncOpen()
   if (profiler_is_active()) {
-    profiler_add_network_marker(
-        mURI, mPriority, mChannelId, NetworkLoadType::LOAD_START,
-        mChannelCreationTimestamp, mLastStatusReported, 0, mCacheDisposition);
+    profiler_add_network_marker(mURI, mPriority, mChannelId,
+                                NetworkLoadType::LOAD_START,
+                                mChannelCreationTimestamp, mLastStatusReported,
+                                0, mCacheDisposition, nullptr, nullptr);
   }
 #endif
 
@@ -8245,7 +8246,7 @@
     profiler_add_network_marker(
         uri, priority, mChannelId, NetworkLoadType::LOAD_STOP,
         mLastStatusReported, TimeStamp::Now(), mLogicalOffset,
-        mCacheDisposition, &mTransactionTimings, nullptr);
+        mCacheDisposition, &mTransactionTimings, nullptr, std::move(mSource));
   }
 #endif
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/netwerk/protocol/http/nsIHttpChannel.idl firefox-trunk-71.0~a1~hg20190915r493291/netwerk/protocol/http/nsIHttpChannel.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/netwerk/protocol/http/nsIHttpChannel.idl	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/netwerk/protocol/http/nsIHttpChannel.idl	2019-09-15 11:33:21.000000000 +0000
@@ -625,4 +625,8 @@
                              in boolean aWarning,
                              in AString aURL,
                              in AString aContentType);
+
+%{ C++
+  virtual void SetSource(UniqueProfilerBacktrace aSource) {}
+%}
 };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/netwerk/test/mochitests/mochitest.ini firefox-trunk-71.0~a1~hg20190915r493291/netwerk/test/mochitests/mochitest.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/netwerk/test/mochitests/mochitest.ini	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/netwerk/test/mochitests/mochitest.ini	2019-09-15 11:33:21.000000000 +0000
@@ -83,29 +83,17 @@
 [test_1503201.html]
 [test_origin_header.html]
 [test_1502055.html]
-skip-if = fission # Timeouts
 support-files = sw_1502055.js file_1502055.sjs iframe_1502055.html
 [test_accept_header.html]
 support-files = test_accept_header.sjs
 [test_different_domain_in_hierarchy.html]
-skip-if = fission
 [test_differentdomain.html]
-skip-if = fission
 [test_image.html]
-skip-if = fission
 [test_loadflags.html]
-skip-if = fission
 [test_same_base_domain.html]
-skip-if = fission
 [test_same_base_domain_2.html]
-skip-if = fission
 [test_same_base_domain_3.html]
-skip-if = fission
 [test_same_base_domain_4.html]
-skip-if = fission
 [test_same_base_domain_5.html]
-skip-if = fission
 [test_same_base_domain_6.html]
-skip-if = fission
 [test_samedomain.html]
-skip-if = fission
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/python/l10n/fluent_migrations/bug_1579540_migrate-the-notification-popup-box-to-ftl.py firefox-trunk-71.0~a1~hg20190915r493291/python/l10n/fluent_migrations/bug_1579540_migrate-the-notification-popup-box-to-ftl.py
--- firefox-trunk-71.0~a1~hg20190913r492975/python/l10n/fluent_migrations/bug_1579540_migrate-the-notification-popup-box-to-ftl.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/python/l10n/fluent_migrations/bug_1579540_migrate-the-notification-popup-box-to-ftl.py	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,71 @@
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+from __future__ import absolute_import
+import fluent.syntax.ast as FTL
+from fluent.migrate.helpers import transforms_from
+from fluent.migrate.helpers import MESSAGE_REFERENCE, TERM_REFERENCE, VARIABLE_REFERENCE
+from fluent.migrate import COPY, CONCAT, REPLACE
+
+def migrate(ctx):
+    """Bug 1579540 - Migrate the notification-popup-box element to ftl, part {index}"""
+
+    ctx.add_transforms(
+        'browser/browser/browser.ftl',
+        'browser/browser/browser.ftl',
+        transforms_from(
+            """
+urlbar-services-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.servicesNotificationAnchor.tooltip") }
+urlbar-web-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.webNotificationAnchor.tooltip") }
+urlbar-midi-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.midiNotificationAnchor.tooltip") }
+urlbar-eme-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.emeNotificationAnchor.tooltip") }
+urlbar-web-authn-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.webAuthnAnchor.tooltip") }
+urlbar-canvas-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.canvasNotificationAnchor.tooltip") }
+urlbar-web-rtc-share-microphone-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.webRTCShareMicrophoneNotificationAnchor.tooltip") }
+urlbar-default-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.defaultNotificationAnchor.tooltip") }
+urlbar-geolocation-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.geolocationNotificationAnchor.tooltip") }
+urlbar-storage-access-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.storageAccessAnchor.tooltip") }
+urlbar-translate-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.translateNotificationAnchor.tooltip") }
+urlbar-web-rtc-share-screen-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.webRTCShareScreenNotificationAnchor.tooltip") }
+urlbar-indexed-db-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.indexedDBNotificationAnchor.tooltip") }
+urlbar-password-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.passwordNotificationAnchor.tooltip") }
+urlbar-translated-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.translatedNotificationAnchor.tooltip") }
+urlbar-plugins-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.pluginsNotificationAnchor.tooltip") }
+urlbar-web-rtc-share-devices-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.webRTCShareDevicesNotificationAnchor.tooltip") }
+urlbar-autoplay-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.autoplayNotificationAnchor.tooltip") }
+urlbar-persistent-storage-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.persistentStorageNotificationAnchor.tooltip") }
+urlbar-addons-notification-anchor =
+    .tooltiptext = { COPY("browser/chrome/browser/browser.dtd", "urlbar.addonsNotificationAnchor.tooltip") }
+"""
+        )
+    )
+
+    ctx.add_transforms(
+        'browser/browser/browser.ftl',
+        'browser/browser/browser.ftl',
+        transforms_from(
+            """
+urlbar-identity-button =
+    .aria-label = {COPY_PATTERN(from_path, "browser-urlbar-identity-button.aria-label")}
+""",
+            from_path='browser/browser/browser.ftl'),
+    )
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/python/mozbuild/mozbuild/code-analysis/mach_commands.py firefox-trunk-71.0~a1~hg20190915r493291/python/mozbuild/mozbuild/code-analysis/mach_commands.py
--- firefox-trunk-71.0~a1~hg20190913r492975/python/mozbuild/mozbuild/code-analysis/mach_commands.py	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/python/mozbuild/mozbuild/code-analysis/mach_commands.py	2019-09-15 11:33:21.000000000 +0000
@@ -120,23 +120,22 @@
             self._processed = self._processed + 1
             return (warning, False)
         if warning is not None:
-            def get_reliability(checker_name):
+            def get_check_config(checker_name):
                 # get the matcher from self._clang_tidy_config that is the 'name' field
-                reliability = None
                 for item in self._clang_tidy_config:
                     if item['name'] == checker_name:
-                        reliability = item.get('reliability', 'low')
-                        break
-                    else:
-                        # We are using a regex in order to also match 'mozilla-.* like checkers'
-                        matcher = re.match(item['name'], checker_name)
-                        if matcher is not None and matcher.group(0) == checker_name:
-                            reliability = item.get('reliability', 'low')
-                            break
-                return reliability
-            reliability = get_reliability(warning['flag'])
-            if reliability is not None:
-                warning['reliability'] = reliability
+                        return item
+
+                    # We are using a regex in order to also match 'mozilla-.* like checkers'
+                    matcher = re.match(item['name'], checker_name)
+                    if matcher is not None and matcher.group(0) == checker_name:
+                        return item
+
+            check_config = get_check_config(warning['flag'])
+            if check_config is not None:
+                warning['reliability'] = check_config.get('reliability', 'low')
+                warning['reason'] = check_config.get('reason')
+                warning['publish'] = check_config.get('publish', True)
         return (warning, True)
 
 
@@ -1262,7 +1261,7 @@
             )
             return self.TOOLS_CHECKER_RETURNED_NO_ISSUES
         if self._dump_results:
-            self._build_autotest_result(test_file_path_json, issues)
+            self._build_autotest_result(test_file_path_json, json.dumps(issues))
         else:
             if not os.path.exists(test_file_path_json):
                 # Result file for test not found maybe regenerate it?
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/security/manager/pki/resources/content/pippki.js firefox-trunk-71.0~a1~hg20190915r493291/security/manager/pki/resources/content/pippki.js
--- firefox-trunk-71.0~a1~hg20190913r492975/security/manager/pki/resources/content/pippki.js	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/security/manager/pki/resources/content/pippki.js	2019-09-15 11:33:21.000000000 +0000
@@ -49,13 +49,10 @@
 }
 
 function getPKCS7String(certArray) {
-  let certList = Cc["@mozilla.org/security/x509certlist;1"].createInstance(
-    Ci.nsIX509CertList
+  let certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
+    Ci.nsIX509CertDB
   );
-  for (let cert of certArray) {
-    certList.addCert(cert);
-  }
-  return certList.asPKCS7Blob();
+  return certdb.asPKCS7Blob(certArray);
 }
 
 function getPEMString(cert) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/security/manager/ssl/nsIX509CertDB.idl firefox-trunk-71.0~a1~hg20190915r493291/security/manager/ssl/nsIX509CertDB.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/security/manager/ssl/nsIX509CertDB.idl	2019-09-13 05:13:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/security/manager/ssl/nsIX509CertDB.idl	2019-09-15 11:33:21.000000000 +0000
@@ -328,4 +328,12 @@
    */
   [must_use]
   Array<nsIX509Cert> getCerts();
+
+  /**
+   * Encode the list of certificates as a PKCS#7 SignedData structure. No data
+   * is actually signed - this is merely a way of exporting a collection of
+   * certificates.
+   */
+  [must_use]
+  ACString asPKCS7Blob(in Array<nsIX509Cert> certList);
 };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/security/manager/ssl/nsIX509CertList.idl firefox-trunk-71.0~a1~hg20190915r493291/security/manager/ssl/nsIX509CertList.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/security/manager/ssl/nsIX509CertList.idl	2019-09-13 05:13:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/security/manager/ssl/nsIX509CertList.idl	2019-09-15 11:33:20.000000000 +0000
@@ -41,14 +41,6 @@
   [notxpcom, noscript, must_use]
   nsNSSCertListPtr getCertList();
 
-  /**
-   * Encode the list of certificates as a PKCS#7 SignedData structure. No data
-   * is actually signed - this is merely a way of exporting a collection of
-   * certificates.
-   */
-  [must_use]
-  ACString asPKCS7Blob();
-
   [notxpcom, noscript]
   void SerializeToIPC(in IpcMessagePtr aMsg);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/security/manager/ssl/nsNSSCertificate.cpp firefox-trunk-71.0~a1~hg20190915r493291/security/manager/ssl/nsNSSCertificate.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/security/manager/ssl/nsNSSCertificate.cpp	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/security/manager/ssl/nsNSSCertificate.cpp	2019-09-15 11:33:21.000000000 +0000
@@ -870,79 +870,6 @@
   return newList;
 }
 
-NS_IMETHODIMP
-nsNSSCertList::AsPKCS7Blob(/*out*/ nsACString& result) {
-  UniqueNSSCMSMessage cmsg(NSS_CMSMessage_Create(nullptr));
-  if (!cmsg) {
-    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-            ("nsNSSCertList::AsPKCS7Blob - can't create CMS message"));
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  UniqueNSSCMSSignedData sigd(nullptr);
-  nsresult rv = ForEachCertificateInChain(
-      [&cmsg, &sigd](nsCOMPtr<nsIX509Cert> aCert, bool /*unused*/,
-                     /*out*/ bool& /*unused*/) {
-        // We need an owning handle when calling nsIX509Cert::GetCert().
-        UniqueCERTCertificate nssCert(aCert->GetCert());
-        if (!sigd) {
-          sigd.reset(NSS_CMSSignedData_CreateCertsOnly(cmsg.get(),
-                                                       nssCert.get(), false));
-          if (!sigd) {
-            MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-                    ("nsNSSCertList::AsPKCS7Blob - can't create SignedData"));
-            return NS_ERROR_FAILURE;
-          }
-        } else if (NSS_CMSSignedData_AddCertificate(
-                       sigd.get(), nssCert.get()) != SECSuccess) {
-          MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-                  ("nsNSSCertList::AsPKCS7Blob - can't add cert"));
-          return NS_ERROR_FAILURE;
-        }
-        return NS_OK;
-      });
-  if (NS_FAILED(rv)) {
-    return rv;
-  }
-
-  NSSCMSContentInfo* cinfo = NSS_CMSMessage_GetContentInfo(cmsg.get());
-  if (NSS_CMSContentInfo_SetContent_SignedData(cmsg.get(), cinfo, sigd.get()) !=
-      SECSuccess) {
-    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-            ("nsNSSCertList::AsPKCS7Blob - can't attach SignedData"));
-    return NS_ERROR_FAILURE;
-  }
-  // cmsg owns sigd now.
-  Unused << sigd.release();
-
-  UniquePLArenaPool arena(PORT_NewArena(1024));
-  if (!arena) {
-    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-            ("nsNSSCertList::AsPKCS7Blob - out of memory"));
-    return NS_ERROR_OUT_OF_MEMORY;
-  }
-
-  SECItem certP7 = {siBuffer, nullptr, 0};
-  NSSCMSEncoderContext* ecx = NSS_CMSEncoder_Start(
-      cmsg.get(), nullptr, nullptr, &certP7, arena.get(), nullptr, nullptr,
-      nullptr, nullptr, nullptr, nullptr);
-  if (!ecx) {
-    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-            ("nsNSSCertList::AsPKCS7Blob - can't create encoder"));
-    return NS_ERROR_FAILURE;
-  }
-
-  if (NSS_CMSEncoder_Finish(ecx) != SECSuccess) {
-    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
-            ("nsNSSCertList::AsPKCS7Blob - failed to add encoded data"));
-    return NS_ERROR_FAILURE;
-  }
-
-  result.Assign(nsDependentCSubstring(
-      reinterpret_cast<const char*>(certP7.data), certP7.len));
-  return NS_OK;
-}
-
 // NB: Any updates (except disk-only fields) must be kept in sync with
 //     |SerializeToIPC|.
 NS_IMETHODIMP
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/security/manager/ssl/nsNSSCertificateDB.cpp firefox-trunk-71.0~a1~hg20190915r493291/security/manager/ssl/nsNSSCertificateDB.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/security/manager/ssl/nsNSSCertificateDB.cpp	2019-09-13 05:13:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/security/manager/ssl/nsNSSCertificateDB.cpp	2019-09-15 11:33:20.000000000 +0000
@@ -1061,6 +1061,77 @@
   return MapSECStatus(srv);
 }
 
+NS_IMETHODIMP nsNSSCertificateDB::AsPKCS7Blob(
+    const nsTArray<RefPtr<nsIX509Cert>>& certList, nsACString& _retval) {
+  if (certList.IsEmpty()) {
+    return NS_ERROR_INVALID_ARG;
+  }
+
+  UniqueNSSCMSMessage cmsg(NSS_CMSMessage_Create(nullptr));
+  if (!cmsg) {
+    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
+            ("nsNSSCertificateDB::AsPKCS7Blob - can't create CMS message"));
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  UniqueNSSCMSSignedData sigd(nullptr);
+  for (const auto& cert : certList) {
+    // We need an owning handle when calling nsIX509Cert::GetCert().
+    UniqueCERTCertificate nssCert(cert->GetCert());
+    if (!sigd) {
+      sigd.reset(
+          NSS_CMSSignedData_CreateCertsOnly(cmsg.get(), nssCert.get(), false));
+      if (!sigd) {
+        MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
+                ("nsNSSCertificateDB::AsPKCS7Blob - can't create SignedData"));
+        return NS_ERROR_FAILURE;
+      }
+    } else if (NSS_CMSSignedData_AddCertificate(sigd.get(), nssCert.get()) !=
+               SECSuccess) {
+      MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
+              ("nsNSSCertificateDB::AsPKCS7Blob - can't add cert"));
+      return NS_ERROR_FAILURE;
+    }
+  }
+
+  NSSCMSContentInfo* cinfo = NSS_CMSMessage_GetContentInfo(cmsg.get());
+  if (NSS_CMSContentInfo_SetContent_SignedData(cmsg.get(), cinfo, sigd.get()) !=
+      SECSuccess) {
+    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
+            ("nsNSSCertificateDB::AsPKCS7Blob - can't attach SignedData"));
+    return NS_ERROR_FAILURE;
+  }
+  // cmsg owns sigd now.
+  Unused << sigd.release();
+
+  UniquePLArenaPool arena(PORT_NewArena(1024));
+  if (!arena) {
+    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
+            ("nsNSSCertificateDB::AsPKCS7Blob - out of memory"));
+    return NS_ERROR_OUT_OF_MEMORY;
+  }
+
+  SECItem certP7 = {siBuffer, nullptr, 0};
+  NSSCMSEncoderContext* ecx = NSS_CMSEncoder_Start(
+      cmsg.get(), nullptr, nullptr, &certP7, arena.get(), nullptr, nullptr,
+      nullptr, nullptr, nullptr, nullptr);
+  if (!ecx) {
+    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
+            ("nsNSSCertificateDB::AsPKCS7Blob - can't create encoder"));
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NSS_CMSEncoder_Finish(ecx) != SECSuccess) {
+    MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
+            ("nsNSSCertificateDB::AsPKCS7Blob - failed to add encoded data"));
+    return NS_ERROR_FAILURE;
+  }
+
+  _retval.Assign(nsDependentCSubstring(
+      reinterpret_cast<const char*>(certP7.data), certP7.len));
+  return NS_OK;
+}
+
 NS_IMETHODIMP
 nsNSSCertificateDB::GetCerts(nsTArray<RefPtr<nsIX509Cert>>& _retval) {
   nsresult rv = BlockUntilLoadableRootsLoaded();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/security/manager/ssl/tests/unit/test_cert_chains.js firefox-trunk-71.0~a1~hg20190915r493291/security/manager/ssl/tests/unit/test_cert_chains.js
--- firefox-trunk-71.0~a1~hg20190913r492975/security/manager/ssl/tests/unit/test_cert_chains.js	2019-09-13 05:13:25.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/security/manager/ssl/tests/unit/test_cert_chains.js	2019-09-15 11:33:21.000000000 +0000
@@ -188,12 +188,10 @@
   let certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
     Ci.nsIX509CertDB
   );
-  let certList = Cc["@mozilla.org/security/x509certlist;1"].createInstance(
-    Ci.nsIX509CertList
-  );
+  let certList = [];
   for (let pem of pemList) {
     let cert = certdb.constructX509FromBase64(pemToBase64(pem));
-    certList.addCert(cert);
+    certList.push(cert);
   }
   return certList;
 }
@@ -242,7 +240,12 @@
     gDefaultEEPEM,
     gTestCAPEM,
   ]);
-  let pkcs7DefaultEE = certListDefaultEE.asPKCS7Blob();
+
+  let certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
+    Ci.nsIX509CertDB
+  );
+  let pkcs7DefaultEE = certdb.asPKCS7Blob(certListDefaultEE);
+
   equal(
     btoa(pkcs7DefaultEE),
     expectedPKCS7ForDefaultEE,
@@ -277,7 +280,7 @@
   let certListUnknownIssuer = build_cert_list_from_pem_list([
     gUnknownIssuerPEM,
   ]);
-  let pkcs7UnknownIssuer = certListUnknownIssuer.asPKCS7Blob();
+  let pkcs7UnknownIssuer = certdb.asPKCS7Blob(certListUnknownIssuer);
   equal(
     btoa(pkcs7UnknownIssuer),
     expectedPKCS7ForUnknownIssuer,
@@ -340,7 +343,7 @@
     gTestIntPEM,
     gTestCAPEM,
   ]);
-  let pkcs7WithIntermediate = certListWithIntermediate.asPKCS7Blob();
+  let pkcs7WithIntermediate = certdb.asPKCS7Blob(certListWithIntermediate);
   equal(
     btoa(pkcs7WithIntermediate),
     expectedPKCS7WithIntermediate,
@@ -348,6 +351,18 @@
   );
 }
 
+function test_cert_pkcs7_empty_array() {
+  let certdb = Cc["@mozilla.org/security/x509certdb;1"].getService(
+    Ci.nsIX509CertDB
+  );
+
+  throws(
+    () => certdb.asPKCS7Blob([]),
+    /NS_ERROR_ILLEGAL_VALUE/,
+    "trying to convert an empty array to pkcs7 should throw"
+  );
+}
+
 function test_security_info_serialization(securityInfo, expectedErrorCode) {
   // Serialize the securityInfo to a string
   let serHelper = Cc["@mozilla.org/network/serialization-helper;1"].getService(
@@ -406,6 +421,11 @@
     run_next_test();
   });
 
+  add_test(function() {
+    test_cert_pkcs7_empty_array();
+    run_next_test();
+  });
+
   // Test successful connection (failedCertChain should be null)
   add_connection_test(
     // re-use pinning certs (keeler)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/services/settings/dumps/main/moz.build firefox-trunk-71.0~a1~hg20190915r493291/services/settings/dumps/main/moz.build
--- firefox-trunk-71.0~a1~hg20190913r492975/services/settings/dumps/main/moz.build	2019-09-13 05:13:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/services/settings/dumps/main/moz.build	2019-09-15 11:33:23.000000000 +0000
@@ -9,6 +9,7 @@
     'language-dictionaries.json',
     'onboarding.json',
     'sites-classification.json',
+    'url-classifier-skip-urls.json',
 ]
 
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/services/settings/dumps/main/url-classifier-skip-urls.json firefox-trunk-71.0~a1~hg20190915r493291/services/settings/dumps/main/url-classifier-skip-urls.json
--- firefox-trunk-71.0~a1~hg20190913r492975/services/settings/dumps/main/url-classifier-skip-urls.json	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/services/settings/dumps/main/url-classifier-skip-urls.json	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1 @@
+{"data":[{"schema":1568303536515,"feature":"tracking-annotation","pattern":"*.apps.fbsbx.com/","id":"e8fd3b61-42b5-44e3-8745-749d1cce327d","last_modified":1568303536823},{"schema":1568154098471,"feature":"socialtracking-annotation","pattern":"*.apps.fbsbx.com/","id":"19ba9682-4bd1-439c-bfcf-642a5dc3c3c5","last_modified":1568303536502}]}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/SOURCE_CHANGESET firefox-trunk-71.0~a1~hg20190915r493291/SOURCE_CHANGESET
--- firefox-trunk-71.0~a1~hg20190913r492975/SOURCE_CHANGESET	2019-09-13 05:13:39.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/SOURCE_CHANGESET	2019-09-15 11:33:35.000000000 +0000
@@ -1 +1 @@
-9b65c42a873628bc2c25ad220b5832fc48a2bae5
\ No newline at end of file
+c969a93b0ca78e59eee771e67f61ad28340b77dc
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/taskcluster/ci/docker-image/kind.yml firefox-trunk-71.0~a1~hg20190915r493291/taskcluster/ci/docker-image/kind.yml
--- firefox-trunk-71.0~a1~hg20190913r492975/taskcluster/ci/docker-image/kind.yml	2019-09-13 05:13:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/taskcluster/ci/docker-image/kind.yml	2019-09-15 11:33:22.000000000 +0000
@@ -202,7 +202,7 @@
             - deb10-python-zstandard
     static-analysis-build:
         symbol: I(static-analysis-build)
-        parent: android-build
+        parent: debian9-base
     mingw32-build:
         symbol: I(mingw)
         parent: debian9-base
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/taskcluster/docker/static-analysis-build/Dockerfile firefox-trunk-71.0~a1~hg20190915r493291/taskcluster/docker/static-analysis-build/Dockerfile
--- firefox-trunk-71.0~a1~hg20190913r492975/taskcluster/docker/static-analysis-build/Dockerfile	2019-09-13 05:13:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/taskcluster/docker/static-analysis-build/Dockerfile	2019-09-15 11:33:23.000000000 +0000
@@ -21,7 +21,6 @@
       cmake \
       flex \
       curl \
-      opam \
       libsqlite3-dev \
       file \
       gawk \
@@ -29,6 +28,7 @@
       gnupg \
       jq \
       libc6-dev \
+      libmpfr-dev \
       nasm \
       openjdk-8-jdk-headless \
       pkg-config \
@@ -55,10 +55,16 @@
       libfontconfig1-dev \
       libfreetype6-dev \
       libgconf2-dev \
+      libgmp-dev \
       libgtk-3-dev \
       libgtk2.0-dev \
       libpango1.0-dev \
       libpulse-dev \
       libx11-xcb-dev \
       libxt-dev \
-      lib32z1
+      lib32z1 \
+      patchelf
+
+# Install opam 2
+RUN curl -sL https://github.com/ocaml/opam/releases/download/2.0.3/opam-2.0.3-x86_64-linux > /usr/bin/opam && \
+    chmod +x /usr/bin/opam
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/taskcluster/docs/attributes.rst firefox-trunk-71.0~a1~hg20190915r493291/taskcluster/docs/attributes.rst
--- firefox-trunk-71.0~a1~hg20190913r492975/taskcluster/docs/attributes.rst	2019-09-13 05:13:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/taskcluster/docs/attributes.rst	2019-09-15 11:33:22.000000000 +0000
@@ -247,7 +247,7 @@
 Most taskcluster artifacts are public, so we've hardcoded ``public/build`` in a
 lot of places. To support private artifacts, we've moved this to the
 ``artifact_prefix`` attribute. It will default to ``public/build`` but will be
-overrideable per-task.
+overridable per-task.
 
 artifact_map
 ===============
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/mozbase/manifestparser/manifestparser/ini.py firefox-trunk-71.0~a1~hg20190915r493291/testing/mozbase/manifestparser/manifestparser/ini.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/mozbase/manifestparser/manifestparser/ini.py	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/mozbase/manifestparser/manifestparser/ini.py	2019-09-15 11:33:22.000000000 +0000
@@ -123,11 +123,13 @@
                 value = value.strip()
                 key_indent = line_indent
 
+                # make sure this key isn't already in the section
+                if key and current_section is not variables:
+                    assert key not in current_section
+
                 if strict:
-                    # make sure this key isn't already in the section or empty
+                    # make sure this key isn't empty
                     assert key
-                    if current_section is not variables:
-                        assert key not in current_section
 
                 current_section[key] = value
                 break
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/mozbase/manifestparser/tests/test_read_ini.py firefox-trunk-71.0~a1~hg20190915r493291/testing/mozbase/manifestparser/tests/test_read_ini.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/mozbase/manifestparser/tests/test_read_ini.py	2019-09-13 05:13:26.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/mozbase/manifestparser/tests/test_read_ini.py	2019-09-15 11:33:22.000000000 +0000
@@ -21,11 +21,11 @@
 
 class IniParserTest(unittest.TestCase):
 
-    def parse_manifest(self, string):
+    def parse_manifest(self, string, **kwargs):
         buf = StringIO()
         buf.write(string)
         buf.seek(0)
-        return read_ini(buf)
+        return read_ini(buf, **kwargs)
 
     def test_inline_comments(self):
         result = self.parse_manifest("""
@@ -59,6 +59,18 @@
         self.assertEqual(result[1][1]['dogs'].split(), ['yep', 'yep'])
         self.assertEqual(result[1][1]['birds'].split(), ['nope', 'fish=nope'])
 
+    def test_dupes_error(self):
+        dupes = """
+[test_dupes.py]
+foo = bar
+foo = baz
+"""
+        with self.assertRaises(AssertionError):
+            self.parse_manifest(dupes, strict=True)
+
+        with self.assertRaises(AssertionError):
+            self.parse_manifest(dupes, strict=False)
+
 
 if __name__ == '__main__':
     mozunit.main()
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/mozbase/mozdevice/mozdevice/adb.py firefox-trunk-71.0~a1~hg20190915r493291/testing/mozbase/mozdevice/mozdevice/adb.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/mozbase/mozdevice/mozdevice/adb.py	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/mozbase/mozdevice/mozdevice/adb.py	2019-09-15 11:33:22.000000000 +0000
@@ -686,13 +686,13 @@
         boot_completed = False
         while not boot_completed and (time.time() - start_time) <= float(timeout):
             try:
-                self.shell_output("/system/bin/ls", timeout=timeout)
+                self.shell_output("/system/bin/ls /system/bin/ls", timeout=timeout)
                 boot_completed = True
                 self._ls = "/system/bin/ls"
             except ADBError as e1:
                 self._logger.info("detect /system/bin/ls {}".format(e1))
                 try:
-                    self.shell_output("/system/xbin/ls", timeout=timeout)
+                    self.shell_output("/system/xbin/ls /system/xbin/ls", timeout=timeout)
                     boot_completed = True
                     self._ls = "/system/xbin/ls"
                 except ADBError as e2:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/specialpowers/content/SpecialPowersChild.jsm firefox-trunk-71.0~a1~hg20190915r493291/testing/specialpowers/content/SpecialPowersChild.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/specialpowers/content/SpecialPowersChild.jsm	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/specialpowers/content/SpecialPowersChild.jsm	2019-09-15 11:33:22.000000000 +0000
@@ -55,12 +55,16 @@
   "AppConstants",
   "resource://gre/modules/AppConstants.jsm"
 );
-
 ChromeUtils.defineModuleGetter(
   this,
   "PerTestCoverageUtils",
   "resource://testing-common/PerTestCoverageUtils.jsm"
 );
+ChromeUtils.defineModuleGetter(
+  this,
+  "ContentTaskUtils",
+  "resource://testing-common/ContentTaskUtils.jsm"
+);
 
 // Allow stuff from this scope to be accessed from non-privileged scopes. This
 // would crash if used outside of automation.
@@ -1676,6 +1680,7 @@
     });
 
     sb.sandbox.SpecialPowers = this;
+    sb.sandbox.ContentTaskUtils = ContentTaskUtils;
     Object.defineProperty(sb.sandbox, "content", {
       get: () => {
         return this.contentWindow;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/content-security-policy/embedded-enforcement/subsumption_algorithm-host_sources-ports.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -1,7 +1,7 @@
 [subsumption_algorithm-host_sources-ports.html]
   [Specified ports must match.]
     expected:
-      if webrender and debug and (os == "linux"): ["PASS", "FAIL"]
+      if webrender and debug and (os == "linux"): ["FAIL", "PASS"]
       FAIL
 
   [Returned CSP should be subsumed if the port is specified but is not default for a more secure scheme.]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/content-security-policy/navigate-to/href-location-blocked.sub.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/content-security-policy/navigate-to/href-location-blocked.sub.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/content-security-policy/navigate-to/href-location-blocked.sub.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/content-security-policy/navigate-to/href-location-blocked.sub.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -1,4 +1,5 @@
 [href-location-blocked.sub.html]
   [Violation report status OK.]
     expected:
-      if os == "android" and debug: ["PASS", "FAIL"]
+      if (os == "android") and debug: ["PASS", "FAIL"]
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -3,20 +3,20 @@
     if os == "linux": https://bugzilla.mozilla.org/show_bug.cgi?id=1573036
     if (os == "win") and (processor == "aarch64"): https://bugzilla.mozilla.org/show_bug.cgi?id=1573036
   expected:
-    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
+    if (os == "mac") and not debug: ["TIMEOUT", "OK"]
     TIMEOUT
   [getChangeSubscriptions returns subscriptions passed to subscribeToChanges]
     expected:
-      if (os == "mac") and not debug: ["FAIL", "TIMEOUT"]
+      if (os == "mac") and not debug: ["TIMEOUT", "FAIL"]
       TIMEOUT
 
   [subscribeToChanges rejects when called outside the install handler]
     expected:
-      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
+      if (os == "mac") and not debug: ["NOTRUN", "FAIL"]
       NOTRUN
 
   [cookiechange dispatched with cookie change that matches subscription]
     expected:
-      if (os == "mac") and not debug: ["FAIL", "NOTRUN"]
+      if (os == "mac") and not debug: ["NOTRUN", "FAIL"]
       NOTRUN
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-both-parent-and-blended-with-3D-transform.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -2,3 +2,5 @@
   expected:
     if (os == "android") and not e10s: FAIL
     if (os == "android") and e10s: PASS
+  fuzzy:
+    if webrender: maxDifference=65;totalPixels=340
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/compositing/mix-blend-mode/mix-blend-mode-parent-with-3D-transform.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,3 @@
+[mix-blend-mode-parent-with-3D-transform.html]
+  fuzzy:
+    if webrender: maxDifference=56;totalPixels=340
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-001.xht.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-001.xht.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-001.xht.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-001.xht.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[bidi-breaking-001.xht]
-  expected:
-    if (os == "android") and not e10s: FAIL
-    if (os == "android") and e10s: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-002.xht.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-002.xht.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-002.xht.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/CSS2/bidi-text/bidi-breaking-002.xht.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[bidi-breaking-002.xht]
-  expected:
-    if (os == "android") and not e10s: FAIL
-    if (os == "android") and e10s: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/CSS2/generated-content/content-counter-004.xht.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/CSS2/generated-content/content-counter-004.xht.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/CSS2/generated-content/content-counter-004.xht.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/CSS2/generated-content/content-counter-004.xht.ini	2019-09-15 11:33:22.000000000 +0000
@@ -1,2 +1,5 @@
 [content-counter-004.xht]
-  expected: FAIL
+  expected:
+    if (os == "android") and not e10s: PASS
+    if (os == "android") and e10s: PASS
+    FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-backgrounds/animations/background-position-interpolation.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-backgrounds/animations/background-position-interpolation.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-backgrounds/animations/background-position-interpolation.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-backgrounds/animations/background-position-interpolation.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -553,3 +553,161 @@
       if (processor == "x86") and (os == "win"): FAIL
       if processor == "aarch64": FAIL
 
+  [CSS Transitions: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.25) should be [calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions with transition: all: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (-0.25) should be [calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [Web Animations: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.5) should be [calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px)\]]
+    expected:
+      if (os == "win") and (processor == "x86_64"): FAIL
+
+  [CSS Animations: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.25) should be [calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.25) should be [calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Animations: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (-0.25) should be [calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (1.25) should be [calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (-0.25) should be [calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Animations: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (1.25) should be [calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions with transition: all: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (1.25) should be [calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Animations: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.75) should be [calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (1.25) should be [calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (-0.25) should be [calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Animations: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (1.25) should be [calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Animations: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.75) should be [calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [Web Animations: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.5) should be [calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px)\]]
+    expected:
+      if (os == "win") and (processor == "x86_64"): FAIL
+
+  [CSS Transitions: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.5) should be [calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Animations: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (-0.25) should be [calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions with transition: all: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.5) should be [calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions with transition: all: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.25) should be [calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Animations: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.5) should be [calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions with transition: all: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (1.25) should be [calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Animations: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.5) should be [calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Animations: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.25) should be [calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions with transition: all: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.25) should be [calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px), calc(0% + 20px) calc(0% + 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.5) should be [calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.75) should be [calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.75) should be [calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions with transition: all: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.5) should be [calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px), calc(0% + 40px) calc(0% + 40px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions with transition: all: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.75) should be [calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions with transition: all: property <background-position> from [unset\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (0.75) should be [calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px), calc(0% + 60px) calc(0% + 60px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
+  [CSS Transitions with transition: all: property <background-position> from [initial\] to [80px 80px, 80px 80px, 80px 80px, 80px 80px\] at (-0.25) should be [calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px), calc(0% - 20px) calc(0% - 20px)\]]
+    expected:
+      if (processor == "x86") and (os == "win"): FAIL
+      if processor == "aarch64": FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-backgrounds/parsing/border-radius-computed.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-backgrounds/parsing/border-radius-computed.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-backgrounds/parsing/border-radius-computed.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-backgrounds/parsing/border-radius-computed.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,28 @@
+[border-radius-computed.html]
+  [Property border-radius value '1px 2% 3px 4%' computes to '1px 2% 3px 4%']
+    expected: FAIL
+
+  [Property border-radius value '1px 2% 1px 1px' computes to '1px 2% 1px 1px']
+    expected: FAIL
+
+  [Property border-radius value '1px 1px 1px 1px / 1px 1px 2% 1px' computes to '1px / 1px 1px 2%']
+    expected: FAIL
+
+  [Property border-radius value '1px 2% 3px 4% / 5em' computes to '1px 2% 3px 4% / 200px']
+    expected: FAIL
+
+  [Property border-radius value '1px' computes to '1px']
+    expected: FAIL
+
+  [Property border-radius value '1px 1px 2% 2%' computes to '1px 1px 2% 2%']
+    expected: FAIL
+
+  [Property border-radius value '5em / 1px 2% 3px 4%' computes to '200px / 1px 2% 3px 4%']
+    expected: FAIL
+
+  [Property border-radius value '1px 1px 1px 2% / 1px 2% 1px 2%' computes to '1px 1px 1px 2% / 1px 2%']
+    expected: FAIL
+
+  [Property border-radius value '1px 2% 2% 2% / 1px 2% 3px 2%' computes to '1px 2% 2% / 1px 2% 3px']
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-fonts/parsing/font-computed.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-fonts/parsing/font-computed.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-fonts/parsing/font-computed.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-fonts/parsing/font-computed.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,1945 @@
+[font-computed.html]
+  [Property font value 'normal bold expanded small-caps xx-large/1.2 Menu' computes to 'normal small-caps 700 expanded 32px / 38.4px Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps 900 normal xx-small cursive' computes to 'normal small-caps 900 normal 9px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'normal italic 100 small-caps medium/normal "FB Armada"' computes to 'italic small-caps 100 normal 16px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'extra-expanded small-caps normal 100 larger/calc(120% + 1.2em) monospace' computes to 'normal small-caps 100 extra-expanded 48px / 115.2px monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps italic expanded smaller Menu' computes to 'italic small-caps 400 expanded 33.3333px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal ultra-condensed normal normal 10px/normal sans-serif' computes to 'normal normal 400 ultra-condensed 10px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal 900 normal xx-large/1.2 fantasy' computes to 'normal normal 900 normal 32px / 38.4px fantasy']
+    expected: FAIL
+
+  [Property font value 'small-caps normal condensed lighter larger/calc(120% + 1.2em) fantasy' computes to 'normal small-caps 700 condensed 48px / 115.2px fantasy']
+    expected: FAIL
+
+  [Property font value 'normal lighter condensed calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to 'normal normal 700 condensed 0px / 0px cursive']
+    expected: FAIL
+
+  [Property font value 'italic bold ultra-condensed small-caps 10px/normal sans-serif' computes to 'italic small-caps 700 ultra-condensed 10px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'semi-condensed small-caps normal xx-small sans-serif' computes to 'normal small-caps 400 semi-condensed 9px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'small-caps italic extra-expanded normal 10px/normal "FB Armada"' computes to 'italic small-caps 400 extra-expanded 10px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal small-caps calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to 'normal small-caps 400 normal 0px / 0px Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps ultra-expanded 100 italic smaller sans-serif' computes to 'italic small-caps 100 ultra-expanded 33.3333px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'expanded normal bolder italic xx-large/1.2 sans-serif' computes to 'italic normal 900 expanded 32px / 38.4px sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps normal smaller sans-serif' computes to 'italic small-caps 400 normal 33.3333px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'small-caps condensed italic calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to 'italic small-caps 400 condensed 0px / 0px fantasy']
+    expected: FAIL
+
+  [Property font value 'bolder condensed normal calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to 'normal normal 900 condensed 0px / 0px cursive']
+    expected: FAIL
+
+  [message-box should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'italic normal expanded small-caps 20%/1.2 "FB Armada"' computes to 'italic small-caps 400 expanded 8px / 9.6px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'italic bold small-caps xx-small fantasy' computes to 'italic small-caps 700 normal 9px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'normal normal italic small-caps larger/calc(120% + 1.2em) monospace' computes to 'italic small-caps 400 normal 48px / 115.2px monospace']
+    expected: FAIL
+
+  [Property font value 'bold extra-condensed 20%/1.2 sans-serif' computes to 'normal normal 700 extra-condensed 8px / 9.6px sans-serif']
+    expected: FAIL
+
+  [Property font value 'xx-small serif' computes to 'normal normal 400 normal 9px / normal serif']
+    expected: FAIL
+
+  [Property font value '100 normal normal italic medium/normal "FB Armada"' computes to 'italic normal 100 normal 16px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value '100 small-caps normal semi-expanded calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to 'normal small-caps 100 semi-expanded 0px / 0px sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal normal expanded normal medium/normal monospace' computes to 'normal normal 400 expanded 13px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal italic normal small-caps xx-small monospace' computes to 'italic small-caps 400 normal 9px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps semi-expanded italic bold medium/normal Menu' computes to 'italic small-caps 700 semi-expanded 16px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal larger/calc(120% + 1.2em) sans-serif' computes to 'normal small-caps 400 normal 48px / 115.2px sans-serif']
+    expected: FAIL
+
+  [Property font value 'extra-condensed normal small-caps italic 20%/1.2 monospace' computes to 'italic small-caps 400 extra-condensed 8px / 9.6px monospace']
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps condensed xx-large/1.2 monospace' computes to 'normal small-caps 400 condensed 24px / 28.8px monospace']
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps smaller fantasy' computes to 'italic small-caps 400 normal 33.3333px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'ultra-condensed small-caps italic normal 10px/normal "FB Armada"' computes to 'italic small-caps 400 ultra-condensed 10px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'extra-condensed italic lighter small-caps 20%/1.2 "FB Armada"' computes to 'italic small-caps 700 extra-condensed 8px / 9.6px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'ultra-expanded italic bold smaller monospace' computes to 'italic normal 700 ultra-expanded 33.3333px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal expanded bold normal xx-large/1.2 serif' computes to 'normal normal 700 expanded 32px / 38.4px serif']
+    expected: FAIL
+
+  [Property font value 'extra-expanded lighter small-caps normal larger/calc(120% + 1.2em) "FB Armada"' computes to 'normal small-caps 700 extra-expanded 48px / 115.2px "FB Armada"']
+    expected: FAIL
+
+  [status-bar should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'normal lighter italic ultra-condensed xx-large/1.2 monospace' computes to 'italic normal 700 ultra-condensed 26px / 31.2px monospace']
+    expected: FAIL
+
+  [Property font value 'normal condensed normal small-caps calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to 'normal small-caps 400 condensed 0px / 0px fantasy']
+    expected: FAIL
+
+  [Property font value 'bold small-caps italic normal medium/normal fantasy' computes to 'italic small-caps 700 normal 16px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'bold extra-expanded italic larger/calc(120% + 1.2em) "FB Armada"' computes to 'italic normal 700 extra-expanded 48px / 115.2px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal italic normal 20%/1.2 cursive' computes to 'italic normal 400 normal 8px / 9.6px cursive']
+    expected: FAIL
+
+  [Property font value '100 italic semi-condensed small-caps xx-large/1.2 fantasy' computes to 'italic small-caps 100 semi-condensed 32px / 38.4px fantasy']
+    expected: FAIL
+
+  [Property font value 'normal normal normal bold calc(30% - 40px)/calc(120% + 1.2em) serif' computes to 'normal normal 700 normal 0px / 0px serif']
+    expected: FAIL
+
+  [Property font value 'normal condensed small-caps italic calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to 'italic small-caps 400 condensed 0px / 0px monospace']
+    expected: FAIL
+
+  [Property font value '100 italic small-caps 10px/normal Menu' computes to 'italic small-caps 100 normal 10px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal italic expanded normal smaller cursive' computes to 'italic normal 400 expanded 33.3333px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'normal small-caps 900 normal xx-large/1.2 cursive' computes to 'normal small-caps 900 normal 32px / 38.4px cursive']
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal 10px/normal Menu' computes to 'italic small-caps 400 normal 10px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'bolder normal small-caps normal medium/normal serif' computes to 'normal small-caps 900 normal 16px / normal serif']
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal xx-small "FB Armada"' computes to 'normal small-caps 400 normal 9px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal 900 semi-expanded italic medium/normal monospace' computes to 'italic normal 900 semi-expanded 12px / normal monospace']
+    expected: FAIL
+
+  [Property font value '900 condensed small-caps normal calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to 'normal small-caps 900 condensed 0px / 0px fantasy']
+    expected: FAIL
+
+  [Property font value 'italic small-caps semi-condensed 900 xx-large/1.2 monospace' computes to 'italic small-caps 900 semi-condensed 26px / 31.2px monospace']
+    expected: FAIL
+
+  [Property font value '100 semi-expanded normal italic medium/normal monospace' computes to 'italic normal 100 semi-expanded 13px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps 100 semi-expanded italic medium/normal monospace' computes to 'italic small-caps 100 semi-expanded 13px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal semi-expanded 900 medium/normal "FB Armada"' computes to 'normal normal 900 semi-expanded 16px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'small-caps expanded xx-large/1.2 Menu' computes to 'normal small-caps 400 expanded 32px / 38.4px Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps medium/normal "FB Armada"' computes to 'normal small-caps 400 normal 16px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'lighter small-caps normal italic 20%/1.2 serif' computes to 'italic small-caps 700 normal 8px / 9.6px serif']
+    expected: FAIL
+
+  [Property font value 'italic condensed 900 normal calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to 'italic normal 900 condensed 0px / 0px monospace']
+    expected: FAIL
+
+  [Property font value 'condensed 100 italic calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to 'italic normal 100 condensed 0px / 0px cursive']
+    expected: FAIL
+
+  [Property font value 'italic small-caps bolder 10px/normal "FB Armada"' computes to 'italic small-caps 900 normal 10px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'semi-condensed 900 italic normal xx-small fantasy' computes to 'italic normal 900 semi-condensed 9px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'condensed normal normal bolder calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to 'normal normal 900 condensed 0px / 0px monospace']
+    expected: FAIL
+
+  [Property font value 'expanded normal xx-large/1.2 "FB Armada"' computes to 'normal normal 400 expanded 32px / 38.4px "FB Armada"']
+    expected: FAIL
+
+  [Property font value '900 italic small-caps normal 20%/1.2 "FB Armada"' computes to 'italic small-caps 900 normal 8px / 9.6px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'extra-expanded 900 normal larger/calc(120% + 1.2em) Menu' computes to 'normal normal 900 extra-expanded 48px / 115.2px Menu']
+    expected: FAIL
+
+  [Property font value 'extra-expanded italic small-caps 900 larger/calc(120% + 1.2em) fantasy' computes to 'italic small-caps 900 extra-expanded 48px / 115.2px fantasy']
+    expected: FAIL
+
+  [menu should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps extra-condensed calc(30% - 40px)/calc(120% + 1.2em) "FB Armada"' computes to 'italic small-caps 400 extra-condensed 0px / 0px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'bolder small-caps italic expanded xx-large/1.2 monospace' computes to 'italic small-caps 900 expanded 24px / 28.8px monospace']
+    expected: FAIL
+
+  [Property font value 'italic normal 100 condensed larger/calc(120% + 1.2em) fantasy' computes to 'italic normal 100 condensed 48px / 115.2px fantasy']
+    expected: FAIL
+
+  [Property font value 'italic 10px/normal fantasy' computes to 'italic normal 400 normal 10px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'small-caps normal bolder extra-expanded calc(30% - 40px)/calc(120% + 1.2em) "FB Armada"' computes to 'normal small-caps 900 extra-expanded 0px / 0px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic normal 20%/1.2 Menu' computes to 'italic small-caps 400 normal 8px / 9.6px Menu']
+    expected: FAIL
+
+  [Property font value 'semi-expanded small-caps lighter italic medium/normal fantasy' computes to 'italic small-caps 700 semi-expanded 16px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'italic semi-condensed bold small-caps xx-small Menu' computes to 'italic small-caps 700 semi-condensed 9px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal italic 900 semi-condensed xx-large/1.2 serif' computes to 'italic normal 900 semi-condensed 32px / 38.4px serif']
+    expected: FAIL
+
+  [Property font value 'small-caps extra-expanded lighter normal larger/calc(120% + 1.2em) serif' computes to 'normal small-caps 700 extra-expanded 48px / 115.2px serif']
+    expected: FAIL
+
+  [Property font value 'normal small-caps semi-condensed 10px/normal Menu' computes to 'normal small-caps 400 semi-condensed 10px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps 100 italic smaller "FB Armada"' computes to 'italic small-caps 100 normal 33.3333px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'small-caps bold italic extra-condensed 20%/1.2 sans-serif' computes to 'italic small-caps 700 extra-condensed 8px / 9.6px sans-serif']
+    expected: FAIL
+
+  [Property font value '900 small-caps italic xx-small cursive' computes to 'italic small-caps 900 normal 9px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'lighter italic condensed normal medium/normal cursive' computes to 'italic normal 700 condensed 16px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'semi-expanded medium/normal Menu' computes to 'normal normal 400 semi-expanded 16px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal ultra-expanded italic lighter smaller sans-serif' computes to 'italic normal 700 ultra-expanded 33.3333px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal bold larger/calc(120% + 1.2em) monospace' computes to 'italic small-caps 700 normal 48px / 115.2px monospace']
+    expected: FAIL
+
+  [Property font value 'normal italic normal extra-condensed xx-large/1.2 "FB Armada"' computes to 'italic normal 400 extra-condensed 32px / 38.4px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal semi-expanded calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to 'normal small-caps 400 semi-expanded 0px / 0px Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps bold normal normal medium/normal fantasy' computes to 'normal small-caps 700 normal 16px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'expanded small-caps normal italic xx-large/1.2 fantasy' computes to 'italic small-caps 400 expanded 32px / 38.4px fantasy']
+    expected: FAIL
+
+  [Property font value 'extra-expanded normal lighter small-caps larger/calc(120% + 1.2em) cursive' computes to 'normal small-caps 700 extra-expanded 48px / 115.2px cursive']
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal medium/normal cursive' computes to 'italic small-caps 400 normal 16px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal ultra-expanded smaller Menu' computes to 'italic small-caps 400 ultra-expanded 33.3333px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'italic expanded normal bolder xx-large/1.2 "FB Armada"' computes to 'italic normal 900 expanded 32px / 38.4px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'ultra-expanded 100 small-caps italic smaller serif' computes to 'italic small-caps 100 ultra-expanded 33.3333px / normal serif']
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps italic xx-small cursive' computes to 'italic small-caps 400 normal 9px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'ultra-condensed normal normal italic 10px/normal cursive' computes to 'italic normal 400 ultra-condensed 10px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'small-caps normal 100 smaller fantasy' computes to 'normal small-caps 100 normal 33.3333px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'normal 900 small-caps normal smaller "FB Armada"' computes to 'normal small-caps 900 normal 33.3333px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'small-caps extra-condensed normal 900 20%/1.2 cursive' computes to 'normal small-caps 900 extra-condensed 8px / 9.6px cursive']
+    expected: FAIL
+
+  [Property font value 'normal lighter italic ultra-condensed xx-large/1.2 monospace' computes to 'italic normal 700 ultra-condensed 24px / 28.8px monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps extra-expanded normal larger/calc(120% + 1.2em) "FB Armada"' computes to 'normal small-caps 400 extra-expanded 48px / 115.2px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'semi-expanded bold italic small-caps medium/normal monospace' computes to 'italic small-caps 700 semi-expanded 13px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal 900 semi-expanded italic medium/normal monospace' computes to 'italic normal 900 semi-expanded 13px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal normal xx-large/1.2 cursive' computes to 'normal normal 400 normal 32px / 38.4px cursive']
+    expected: FAIL
+
+  [Property font value 'bolder small-caps normal normal 10px/normal "FB Armada"' computes to 'normal small-caps 900 normal 10px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal normal smaller cursive' computes to 'normal small-caps 400 normal 33.3333px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'small-caps normal xx-large/1.2 serif' computes to 'normal small-caps 400 normal 32px / 38.4px serif']
+    expected: FAIL
+
+  [Property font value 'bold normal semi-expanded normal 10px/normal monospace' computes to 'normal normal 700 semi-expanded 10px / normal monospace']
+    expected: FAIL
+
+  [Property font value '900 10px/normal cursive' computes to 'normal normal 900 normal 10px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'normal bolder small-caps extra-condensed 20%/1.2 sans-serif' computes to 'normal small-caps 900 extra-condensed 8px / 9.6px sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal italic 10px/normal sans-serif' computes to 'italic normal 400 normal 10px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'bolder italic extra-condensed xx-small sans-serif' computes to 'italic normal 900 extra-condensed 9px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'ultra-condensed bolder normal italic 10px/normal serif' computes to 'italic normal 900 ultra-condensed 10px / normal serif']
+    expected: FAIL
+
+  [Property font value 'italic 900 ultra-expanded normal smaller serif' computes to 'italic normal 900 ultra-expanded 33.3333px / normal serif']
+    expected: FAIL
+
+  [Property font value 'semi-expanded bold italic small-caps medium/normal monospace' computes to 'italic small-caps 700 semi-expanded 12px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic lighter calc(30% - 40px)/calc(120% + 1.2em) "FB Armada"' computes to 'italic small-caps 700 normal 0px / 0px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'semi-condensed normal 900 xx-small "FB Armada"' computes to 'normal normal 900 semi-condensed 9px / normal "FB Armada"']
+    expected: FAIL
+
+  [icon should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'normal normal lighter semi-condensed calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to 'normal normal 700 semi-condensed 0px / 0px cursive']
+    expected: FAIL
+
+  [Property font value 'extra-expanded normal italic lighter larger/calc(120% + 1.2em) sans-serif' computes to 'italic normal 700 extra-expanded 48px / 115.2px sans-serif']
+    expected: FAIL
+
+  [Property font value 'lighter normal extra-expanded small-caps calc(30% - 40px)/calc(120% + 1.2em) "FB Armada"' computes to 'normal small-caps 700 extra-expanded 0px / 0px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'italic normal lighter small-caps xx-large/1.2 cursive' computes to 'italic small-caps 700 normal 32px / 38.4px cursive']
+    expected: FAIL
+
+  [Property font value 'bold small-caps normal smaller Menu' computes to 'normal small-caps 700 normal 33.3333px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal small-caps 100 medium/normal sans-serif' computes to 'normal small-caps 100 normal 16px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'bold italic normal normal xx-large/1.2 cursive' computes to 'italic normal 700 normal 32px / 38.4px cursive']
+    expected: FAIL
+
+  [small-caption should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'small-caps italic smaller monospace' computes to 'italic small-caps 400 normal 33.3333px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'italic normal bold xx-small serif' computes to 'italic normal 700 normal 9px / normal serif']
+    expected: FAIL
+
+  [Property font value 'normal 100 normal ultra-expanded 20%/1.2 serif' computes to 'normal normal 100 ultra-expanded 8px / 9.6px serif']
+    expected: FAIL
+
+  [Property font value 'italic small-caps condensed normal medium/normal fantasy' computes to 'italic small-caps 400 condensed 16px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'italic semi-condensed normal normal xx-small monospace' computes to 'italic normal 400 semi-condensed 9px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal extra-condensed normal italic 20%/1.2 cursive' computes to 'italic normal 400 extra-condensed 8px / 9.6px cursive']
+    expected: FAIL
+
+  [Property font value 'expanded bolder small-caps xx-large/1.2 Menu' computes to 'normal small-caps 900 expanded 32px / 38.4px Menu']
+    expected: FAIL
+
+  [Property font value 'normal 100 semi-condensed normal xx-small fantasy' computes to 'normal normal 100 semi-condensed 9px / normal fantasy']
+    expected: FAIL
+
+  [Property font value '100 normal small-caps condensed larger/calc(120% + 1.2em) cursive' computes to 'normal small-caps 100 condensed 48px / 115.2px cursive']
+    expected: FAIL
+
+  [Property font value 'normal italic bolder calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to 'italic normal 900 normal 0px / 0px monospace']
+    expected: FAIL
+
+  [Property font value 'ultra-expanded normal small-caps smaller cursive' computes to 'normal small-caps 400 ultra-expanded 33.3333px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'italic normal semi-condensed smaller monospace' computes to 'italic normal 400 semi-condensed 33.3333px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps 900 italic normal 10px/normal serif' computes to 'italic small-caps 900 normal 10px / normal serif']
+    expected: FAIL
+
+  [Property font value 'small-caps ultra-expanded normal normal smaller serif' computes to 'normal small-caps 400 ultra-expanded 33.3333px / normal serif']
+    expected: FAIL
+
+  [Property font value 'normal italic ultra-expanded bold 20%/1.2 monospace' computes to 'italic normal 700 ultra-expanded 8px / 9.6px monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps normal ultra-expanded xx-small serif' computes to 'normal small-caps 400 ultra-expanded 9px / normal serif']
+    expected: FAIL
+
+  [Property font value 'small-caps bolder normal italic xx-large/1.2 monospace' computes to 'italic small-caps 900 normal 24px / 28.8px monospace']
+    expected: FAIL
+
+  [Property font value 'italic small-caps semi-condensed 900 xx-large/1.2 monospace' computes to 'italic small-caps 900 semi-condensed 24px / 28.8px monospace']
+    expected: FAIL
+
+  [Property font value 'normal bolder normal italic smaller Menu' computes to 'italic normal 900 normal 33.3333px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'bolder ultra-expanded italic normal smaller serif' computes to 'italic normal 900 ultra-expanded 33.3333px / normal serif']
+    expected: FAIL
+
+  [Property font value 'semi-condensed small-caps bolder normal xx-small cursive' computes to 'normal small-caps 900 semi-condensed 9px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'normal normal normal italic 10px/normal Menu' computes to 'italic normal 400 normal 10px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'italic bold larger/calc(120% + 1.2em) Menu' computes to 'italic normal 700 normal 48px / 115.2px Menu']
+    expected: FAIL
+
+  [Property font value 'italic 900 normal semi-expanded calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to 'italic normal 900 semi-expanded 0px / 0px cursive']
+    expected: FAIL
+
+  [Property font value 'normal extra-condensed small-caps normal 20%/1.2 fantasy' computes to 'normal small-caps 400 extra-condensed 8px / 9.6px fantasy']
+    expected: FAIL
+
+  [Property font value 'small-caps normal ultra-condensed normal medium/normal sans-serif' computes to 'normal small-caps 400 ultra-condensed 16px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps larger/calc(120% + 1.2em) serif' computes to 'italic small-caps 400 normal 48px / 115.2px serif']
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal ultra-condensed smaller fantasy' computes to 'normal small-caps 400 ultra-condensed 33.3333px / normal fantasy']
+    expected: FAIL
+
+  [Property font value '100 italic xx-small serif' computes to 'italic normal 100 normal 9px / normal serif']
+    expected: FAIL
+
+  [Property font value 'normal normal italic bolder smaller Menu' computes to 'italic normal 900 normal 33.3333px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'italic 100 extra-expanded larger/calc(120% + 1.2em) "FB Armada"' computes to 'italic normal 100 extra-expanded 48px / 115.2px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal normal ultra-condensed 100 smaller serif' computes to 'normal normal 100 ultra-condensed 33.3333px / normal serif']
+    expected: FAIL
+
+  [Property font value 'normal ultra-expanded lighter small-caps smaller cursive' computes to 'normal small-caps 700 ultra-expanded 33.3333px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'normal normal ultra-expanded small-caps larger/calc(120% + 1.2em) "FB Armada"' computes to 'normal small-caps 400 ultra-expanded 48px / 115.2px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal normal extra-expanded italic xx-large/1.2 Menu' computes to 'italic normal 400 extra-expanded 32px / 38.4px Menu']
+    expected: FAIL
+
+  [Property font value 'italic bolder normal smaller "FB Armada"' computes to 'italic normal 900 normal 33.3333px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'bolder normal italic smaller cursive' computes to 'italic normal 900 normal 33.3333px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'italic normal extra-expanded 900 calc(30% - 40px)/calc(120% + 1.2em) serif' computes to 'italic normal 900 extra-expanded 0px / 0px serif']
+    expected: FAIL
+
+  [Property font value '900 italic normal medium/normal sans-serif' computes to 'italic normal 900 normal 16px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal normal semi-expanded xx-small fantasy' computes to 'normal normal 400 semi-expanded 9px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'condensed small-caps calc(30% - 40px)/calc(120% + 1.2em) serif' computes to 'normal small-caps 400 condensed 0px / 0px serif']
+    expected: FAIL
+
+  [Property font value 'normal italic extra-expanded small-caps 10px/normal fantasy' computes to 'italic small-caps 400 extra-expanded 10px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'normal italic semi-expanded larger/calc(120% + 1.2em) sans-serif' computes to 'italic normal 400 semi-expanded 48px / 115.2px sans-serif']
+    expected: FAIL
+
+  [Property font value 'italic normal normal small-caps medium/normal serif' computes to 'italic small-caps 400 normal 16px / normal serif']
+    expected: FAIL
+
+  [Property font value '100 small-caps ultra-expanded normal smaller "FB Armada"' computes to 'normal small-caps 100 ultra-expanded 33.3333px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'condensed small-caps bold calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to 'normal small-caps 700 condensed 0px / 0px sans-serif']
+    expected: FAIL
+
+  [Property font value '100 extra-condensed small-caps 20%/1.2 cursive' computes to 'normal small-caps 100 extra-condensed 8px / 9.6px cursive']
+    expected: FAIL
+
+  [Property font value 'normal bold small-caps italic 10px/normal serif' computes to 'italic small-caps 700 normal 10px / normal serif']
+    expected: FAIL
+
+  [Property font value 'small-caps semi-condensed italic normal xx-small monospace' computes to 'italic small-caps 400 semi-condensed 9px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps expanded bolder xx-large/1.2 "FB Armada"' computes to 'normal small-caps 900 expanded 32px / 38.4px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'italic extra-condensed 20%/1.2 cursive' computes to 'italic normal 400 extra-condensed 8px / 9.6px cursive']
+    expected: FAIL
+
+  [Property font value 'italic ultra-condensed small-caps lighter 10px/normal cursive' computes to 'italic small-caps 700 ultra-condensed 10px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps condensed 20%/1.2 fantasy' computes to 'italic small-caps 400 condensed 8px / 9.6px fantasy']
+    expected: FAIL
+
+  [Property font value 'italic normal bolder normal medium/normal sans-serif' computes to 'italic normal 900 normal 16px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'lighter small-caps extra-expanded larger/calc(120% + 1.2em) Menu' computes to 'normal small-caps 700 extra-expanded 48px / 115.2px Menu']
+    expected: FAIL
+
+  [Property font value 'normal normal italic normal xx-large/1.2 fantasy' computes to 'italic normal 400 normal 32px / 38.4px fantasy']
+    expected: FAIL
+
+  [Property font value 'semi-condensed normal italic xx-small Menu' computes to 'italic normal 400 semi-condensed 9px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps bold 10px/normal cursive' computes to 'italic small-caps 700 normal 10px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'lighter semi-condensed normal normal xx-small fantasy' computes to 'normal normal 700 semi-condensed 9px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'small-caps bolder condensed calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to 'normal small-caps 900 condensed 0px / 0px cursive']
+    expected: FAIL
+
+  [Property font value 'normal medium/normal sans-serif' computes to 'normal normal 400 normal 16px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'small-caps normal bold italic 20%/1.2 Menu' computes to 'italic small-caps 700 normal 8px / 9.6px Menu']
+    expected: FAIL
+
+  [Property font value 'normal normal normal ultra-condensed xx-small sans-serif' computes to 'normal normal 400 ultra-condensed 9px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal normal 20%/1.2 "FB Armada"' computes to 'italic small-caps 400 normal 8px / 9.6px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps normal 10px/normal monospace' computes to 'italic small-caps 400 normal 10px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps italic bolder semi-expanded larger/calc(120% + 1.2em) monospace' computes to 'italic small-caps 900 semi-expanded 48px / 115.2px monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal semi-condensed xx-small sans-serif' computes to 'italic small-caps 400 semi-condensed 9px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps condensed xx-large/1.2 monospace' computes to 'normal small-caps 400 condensed 26px / 31.2px monospace']
+    expected: FAIL
+
+  [Property font value 'italic 100 normal small-caps 20%/1.2 sans-serif' computes to 'italic small-caps 100 normal 8px / 9.6px sans-serif']
+    expected: FAIL
+
+  [Property font value 'italic normal 20%/1.2 monospace' computes to 'italic normal 400 normal 8px / 9.6px monospace']
+    expected: FAIL
+
+  [Property font value 'normal small-caps semi-expanded normal 20%/1.2 "FB Armada"' computes to 'normal small-caps 400 semi-expanded 8px / 9.6px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic 10px/normal monospace' computes to 'italic small-caps 400 normal 10px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal italic normal normal calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to 'italic normal 400 normal 0px / 0px fantasy']
+    expected: FAIL
+
+  [Property font value 'italic normal normal calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to 'italic normal 400 normal 0px / 0px Menu']
+    expected: FAIL
+
+  [Property font value 'normal extra-expanded bolder italic larger/calc(120% + 1.2em) sans-serif' computes to 'italic normal 900 extra-expanded 48px / 115.2px sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps 20%/1.2 serif' computes to 'normal small-caps 400 normal 8px / 9.6px serif']
+    expected: FAIL
+
+  [Property font value 'italic normal normal 100 xx-large/1.2 sans-serif' computes to 'italic normal 100 normal 32px / 38.4px sans-serif']
+    expected: FAIL
+
+  [Property font value '900 normal italic extra-condensed calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to 'italic normal 900 extra-condensed 0px / 0px Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps bolder normal italic xx-large/1.2 monospace' computes to 'italic small-caps 900 normal 26px / 31.2px monospace']
+    expected: FAIL
+
+  [Property font value 'italic ultra-expanded small-caps normal smaller sans-serif' computes to 'italic small-caps 400 ultra-expanded 33.3333px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value '900 normal semi-condensed smaller fantasy' computes to 'normal normal 900 semi-condensed 33.3333px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'bold normal 20%/1.2 fantasy' computes to 'normal normal 700 normal 8px / 9.6px fantasy']
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal normal xx-large/1.2 fantasy' computes to 'italic small-caps 400 normal 32px / 38.4px fantasy']
+    expected: FAIL
+
+  [Property font value '900 normal normal small-caps xx-large/1.2 serif' computes to 'normal small-caps 900 normal 32px / 38.4px serif']
+    expected: FAIL
+
+  [Property font value 'normal small-caps bolder condensed smaller monospace' computes to 'normal small-caps 900 condensed 33.3333px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'italic extra-expanded small-caps larger/calc(120% + 1.2em) serif' computes to 'italic small-caps 400 extra-expanded 48px / 115.2px serif']
+    expected: FAIL
+
+  [Property font value 'ultra-expanded small-caps italic smaller Menu' computes to 'italic small-caps 400 ultra-expanded 33.3333px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'bold normal small-caps xx-small "FB Armada"' computes to 'normal small-caps 700 normal 9px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value '100 normal italic small-caps 20%/1.2 monospace' computes to 'italic small-caps 100 normal 8px / 9.6px monospace']
+    expected: FAIL
+
+  [Property font value 'normal small-caps extra-expanded lighter xx-small sans-serif' computes to 'normal small-caps 700 extra-expanded 9px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'lighter ultra-condensed italic small-caps 10px/normal sans-serif' computes to 'italic small-caps 700 ultra-condensed 10px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal normal medium/normal serif' computes to 'normal small-caps 400 normal 16px / normal serif']
+    expected: FAIL
+
+  [Property font value 'extra-condensed small-caps italic 900 20%/1.2 serif' computes to 'italic small-caps 900 extra-condensed 8px / 9.6px serif']
+    expected: FAIL
+
+  [Property font value 'normal semi-expanded italic medium/normal Menu' computes to 'italic normal 400 semi-expanded 16px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal normal bold italic 10px/normal serif' computes to 'italic normal 700 normal 10px / normal serif']
+    expected: FAIL
+
+  [caption should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'lighter normal small-caps italic xx-large/1.2 sans-serif' computes to 'italic small-caps 700 normal 32px / 38.4px sans-serif']
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal bolder 20%/1.2 monospace' computes to 'normal small-caps 900 normal 8px / 9.6px monospace']
+    expected: FAIL
+
+  [Property font value 'normal expanded italic normal xx-large/1.2 "FB Armada"' computes to 'italic normal 400 expanded 32px / 38.4px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'small-caps italic ultra-expanded lighter 20%/1.2 serif' computes to 'italic small-caps 700 ultra-expanded 8px / 9.6px serif']
+    expected: FAIL
+
+  [Property font value 'bold semi-condensed small-caps italic xx-small monospace' computes to 'italic small-caps 700 semi-condensed 9px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal italic normal 900 medium/normal Menu' computes to 'italic normal 900 normal 16px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal italic lighter normal xx-small Menu' computes to 'italic normal 700 normal 9px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal bolder italic small-caps medium/normal fantasy' computes to 'italic small-caps 900 normal 16px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'lighter normal italic normal 10px/normal fantasy' computes to 'italic normal 700 normal 10px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic extra-condensed xx-small serif' computes to 'italic small-caps 400 extra-condensed 9px / normal serif']
+    expected: FAIL
+
+  [Property font value 'normal ultra-condensed small-caps 10px/normal cursive' computes to 'normal small-caps 400 ultra-condensed 10px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'semi-expanded italic small-caps medium/normal sans-serif' computes to 'italic small-caps 400 semi-expanded 16px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'italic bolder small-caps normal medium/normal monospace' computes to 'italic small-caps 900 normal 13px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic normal medium/normal serif' computes to 'italic small-caps 400 normal 16px / normal serif']
+    expected: FAIL
+
+  [Property font value 'normal extra-expanded italic small-caps larger/calc(120% + 1.2em) serif' computes to 'italic small-caps 400 extra-expanded 48px / 115.2px serif']
+    expected: FAIL
+
+  [Property font value 'expanded normal italic small-caps xx-large/1.2 serif' computes to 'italic small-caps 400 expanded 32px / 38.4px serif']
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal italic xx-large/1.2 sans-serif' computes to 'italic small-caps 400 normal 32px / 38.4px sans-serif']
+    expected: FAIL
+
+  [Property font value 'italic small-caps lighter normal 20%/1.2 serif' computes to 'italic small-caps 700 normal 8px / 9.6px serif']
+    expected: FAIL
+
+  [Property font value 'extra-condensed normal normal small-caps 20%/1.2 fantasy' computes to 'normal small-caps 400 extra-condensed 8px / 9.6px fantasy']
+    expected: FAIL
+
+  [Property font value 'italic normal normal normal xx-small "FB Armada"' computes to 'italic normal 400 normal 9px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'ultra-expanded normal normal normal smaller sans-serif' computes to 'normal normal 400 ultra-expanded 33.3333px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'italic extra-condensed 100 20%/1.2 fantasy' computes to 'italic normal 100 extra-condensed 8px / 9.6px fantasy']
+    expected: FAIL
+
+  [Property font value '900 small-caps ultra-condensed italic 10px/normal serif' computes to 'italic small-caps 900 ultra-condensed 10px / normal serif']
+    expected: FAIL
+
+  [Property font value 'ultra-expanded italic smaller fantasy' computes to 'italic normal 400 ultra-expanded 33.3333px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal italic 10px/normal fantasy' computes to 'italic small-caps 400 normal 10px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'ultra-condensed italic bolder normal 10px/normal Menu' computes to 'italic normal 900 ultra-condensed 10px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'bolder normal normal calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to 'normal normal 900 normal 0px / 0px monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps italic bold normal xx-large/1.2 fantasy' computes to 'italic small-caps 700 normal 32px / 38.4px fantasy']
+    expected: FAIL
+
+  [Property font value 'normal normal bolder small-caps 20%/1.2 sans-serif' computes to 'normal small-caps 900 normal 8px / 9.6px sans-serif']
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal 100 calc(30% - 40px)/calc(120% + 1.2em) serif' computes to 'italic small-caps 100 normal 0px / 0px serif']
+    expected: FAIL
+
+  [Property font value 'normal bold italic normal xx-small cursive' computes to 'italic normal 700 normal 9px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'bolder italic normal small-caps larger/calc(120% + 1.2em) fantasy' computes to 'italic small-caps 900 normal 48px / 115.2px fantasy']
+    expected: FAIL
+
+  [Property font value 'normal normal normal larger/calc(120% + 1.2em) fantasy' computes to 'normal normal 400 normal 48px / 115.2px fantasy']
+    expected: FAIL
+
+  [Property font value 'italic small-caps xx-small sans-serif' computes to 'italic small-caps 400 normal 9px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'bolder normal expanded italic 20%/1.2 Menu' computes to 'italic normal 900 expanded 8px / 9.6px Menu']
+    expected: FAIL
+
+  [Property font value 'ultra-condensed normal small-caps normal 10px/normal fantasy' computes to 'normal small-caps 400 ultra-condensed 10px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'normal normal 100 larger/calc(120% + 1.2em) Menu' computes to 'normal normal 100 normal 48px / 115.2px Menu']
+    expected: FAIL
+
+  [Property font value 'normal normal italic extra-condensed 10px/normal "FB Armada"' computes to 'italic normal 400 extra-condensed 10px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal bolder larger/calc(120% + 1.2em) cursive' computes to 'normal small-caps 900 normal 48px / 115.2px cursive']
+    expected: FAIL
+
+  [Property font value '900 expanded normal small-caps xx-large/1.2 Menu' computes to 'normal small-caps 900 expanded 32px / 38.4px Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps normal 900 normal 10px/normal monospace' computes to 'normal small-caps 900 normal 10px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'extra-condensed italic normal normal 20%/1.2 Menu' computes to 'italic normal 400 extra-condensed 8px / 9.6px Menu']
+    expected: FAIL
+
+  [Property font value 'normal bold normal normal larger/calc(120% + 1.2em) monospace' computes to 'normal normal 700 normal 48px / 115.2px monospace']
+    expected: FAIL
+
+  [Property font value 'normal normal 900 normal smaller "FB Armada"' computes to 'normal normal 900 normal 33.3333px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal normal expanded normal medium/normal monospace' computes to 'normal normal 400 expanded 12px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps normal calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to 'normal small-caps 400 normal 0px / 0px sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal 100 medium/normal cursive' computes to 'normal normal 100 normal 16px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'extra-expanded normal normal larger/calc(120% + 1.2em) serif' computes to 'normal normal 400 extra-expanded 48px / 115.2px serif']
+    expected: FAIL
+
+  [Property font value 'ultra-expanded bold normal normal smaller "FB Armada"' computes to 'normal normal 700 ultra-expanded 33.3333px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'expanded 100 xx-large/1.2 monospace' computes to 'normal normal 100 expanded 26px / 31.2px monospace']
+    expected: FAIL
+
+  [Property font value 'italic normal semi-expanded normal 10px/normal Menu' computes to 'italic normal 400 semi-expanded 10px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal small-caps expanded italic calc(30% - 40px)/calc(120% + 1.2em) serif' computes to 'italic small-caps 400 expanded 0px / 0px serif']
+    expected: FAIL
+
+  [Property font value 'ultra-condensed italic normal 10px/normal monospace' computes to 'italic normal 400 ultra-condensed 10px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal semi-condensed normal bolder xx-small monospace' computes to 'normal normal 900 semi-condensed 9px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps 100 calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to 'normal small-caps 100 normal 0px / 0px sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal extra-expanded larger/calc(120% + 1.2em) "FB Armada"' computes to 'normal normal 400 extra-expanded 48px / 115.2px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'expanded italic small-caps normal xx-large/1.2 cursive' computes to 'italic small-caps 400 expanded 32px / 38.4px cursive']
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps 900 20%/1.2 Menu' computes to 'italic small-caps 900 normal 8px / 9.6px Menu']
+    expected: FAIL
+
+  [Property font value 'semi-expanded small-caps normal normal medium/normal cursive' computes to 'normal small-caps 400 semi-expanded 16px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'normal normal normal small-caps 20%/1.2 "FB Armada"' computes to 'normal small-caps 400 normal 8px / 9.6px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'italic semi-expanded normal small-caps medium/normal Menu' computes to 'italic small-caps 400 semi-expanded 16px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps lighter medium/normal fantasy' computes to 'normal small-caps 700 normal 16px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'condensed normal small-caps 100 calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to 'normal small-caps 100 condensed 0px / 0px Menu']
+    expected: FAIL
+
+  [Property font value 'normal ultra-expanded normal smaller serif' computes to 'normal normal 400 ultra-expanded 33.3333px / normal serif']
+    expected: FAIL
+
+  [Property font value 'expanded 100 xx-large/1.2 monospace' computes to 'normal normal 100 expanded 24px / 28.8px monospace']
+    expected: FAIL
+
+  [Property font value 'bold italic small-caps ultra-condensed calc(30% - 40px)/calc(120% + 1.2em) serif' computes to 'italic small-caps 700 ultra-condensed 0px / 0px serif']
+    expected: FAIL
+
+  [Property font value '100 semi-expanded normal italic medium/normal monospace' computes to 'italic normal 100 semi-expanded 12px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal 100 small-caps larger/calc(120% + 1.2em) Menu' computes to 'normal small-caps 100 normal 48px / 115.2px Menu']
+    expected: FAIL
+
+  [Property font value 'italic bolder small-caps normal medium/normal monospace' computes to 'italic small-caps 900 normal 12px / normal monospace']
+    expected: FAIL
+
+  [Property font value '900 small-caps larger/calc(120% + 1.2em) monospace' computes to 'normal small-caps 900 normal 48px / 115.2px monospace']
+    expected: FAIL
+
+  [Property font value 'italic small-caps 100 ultra-condensed calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to 'italic small-caps 100 ultra-condensed 0px / 0px sans-serif']
+    expected: FAIL
+
+  [Property font value 'small-caps 100 semi-expanded italic medium/normal monospace' computes to 'italic small-caps 100 semi-expanded 12px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'lighter italic normal ultra-expanded smaller monospace' computes to 'italic normal 700 ultra-expanded 33.3333px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'small-caps italic 900 medium/normal cursive' computes to 'italic small-caps 900 normal 16px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic xx-small "FB Armada"' computes to 'italic small-caps 400 normal 9px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal semi-condensed small-caps 100 xx-small Menu' computes to 'normal small-caps 100 semi-condensed 9px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic lighter xx-large/1.2 sans-serif' computes to 'italic small-caps 700 normal 32px / 38.4px sans-serif']
+    expected: FAIL
+
+  [Property font value 'bold normal normal ultra-condensed larger/calc(120% + 1.2em) sans-serif' computes to 'normal normal 700 ultra-condensed 48px / 115.2px sans-serif']
+    expected: FAIL
+
+  [Property font value 'normal 900 italic calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to 'italic normal 900 normal 0px / 0px sans-serif']
+    expected: FAIL
+
+  [Property font value 'semi-condensed italic normal 100 xx-small serif' computes to 'italic normal 100 semi-condensed 9px / normal serif']
+    expected: FAIL
+
+  [Property font value 'condensed italic normal small-caps calc(30% - 40px)/calc(120% + 1.2em) "FB Armada"' computes to 'italic small-caps 400 condensed 0px / 0px "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'normal small-caps bold italic larger/calc(120% + 1.2em) fantasy' computes to 'italic small-caps 700 normal 48px / 115.2px fantasy']
+    expected: FAIL
+
+  [Property font value 'small-caps lighter semi-condensed normal xx-small fantasy' computes to 'normal small-caps 700 semi-condensed 9px / normal fantasy']
+    expected: FAIL
+
+  [Property font value 'normal normal normal normal smaller monospace' computes to 'normal normal 400 normal 33.3333px / normal monospace']
+    expected: FAIL
+
+  [Property font value 'normal normal italic medium/normal cursive' computes to 'italic normal 400 normal 16px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'italic lighter small-caps expanded xx-large/1.2 Menu' computes to 'italic small-caps 700 expanded 32px / 38.4px Menu']
+    expected: FAIL
+
+  [Property font value 'italic normal normal ultra-condensed larger/calc(120% + 1.2em) cursive' computes to 'italic normal 400 ultra-condensed 48px / 115.2px cursive']
+    expected: FAIL
+
+  [Property font value 'normal lighter normal small-caps 10px/normal "FB Armada"' computes to 'normal small-caps 700 normal 10px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'small-caps lighter normal ultra-condensed larger/calc(120% + 1.2em) Menu' computes to 'normal small-caps 700 ultra-condensed 48px / 115.2px Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic expanded larger/calc(120% + 1.2em) cursive' computes to 'italic small-caps 400 expanded 48px / 115.2px cursive']
+    expected: FAIL
+
+  [Property font value 'italic lighter normal normal 10px/normal serif' computes to 'italic normal 700 normal 10px / normal serif']
+    expected: FAIL
+
+  [Property font value 'extra-condensed lighter normal small-caps 20%/1.2 sans-serif' computes to 'normal small-caps 700 extra-condensed 8px / 9.6px sans-serif']
+    expected: FAIL
+
+  [Property font value 'semi-expanded normal italic normal medium/normal "FB Armada"' computes to 'italic normal 400 semi-expanded 16px / normal "FB Armada"']
+    expected: FAIL
+
+  [Property font value 'italic small-caps extra-condensed xx-small cursive' computes to 'italic small-caps 400 extra-condensed 9px / normal cursive']
+    expected: FAIL
+
+  [Property font value 'small-caps ultra-condensed normal italic 10px/normal sans-serif' computes to 'italic small-caps 400 ultra-condensed 10px / normal sans-serif']
+    expected: FAIL
+
+  [Property font value 'semi-expanded normal bold normal medium/normal serif' computes to 'normal normal 700 semi-expanded 16px / normal serif']
+    expected: FAIL
+
+  [Property font value 'bolder small-caps italic expanded xx-large/1.2 monospace' computes to 'italic small-caps 900 expanded 26px / 31.2px monospace']
+    expected: FAIL
+
+  [Property font value 'italic condensed normal calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to 'italic normal 400 condensed 0px / 0px fantasy']
+    expected: FAIL
+
+  [Property font value 'lighter normal normal normal xx-small Menu' computes to 'normal normal 700 normal 9px / normal Menu']
+    expected: FAIL
+
+  [Property font value 'small-caps normal extra-condensed italic xx-large/1.2 cursive' computes to 'italic small-caps 400 extra-condensed 32px / 38.4px cursive']
+    expected: FAIL
+
+  [Property font value 'italic semi-condensed bold small-caps xx-small Menu' computes to ['italic small-caps 700 semi-condensed 9px/normal Menu' or 'italic small-caps 700 semi-condensed 9px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value '900 10px/normal cursive' computes to ['normal normal 900 normal 10px/normal cursive' or 'normal normal 900 normal 10px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal ultra-expanded italic lighter smaller sans-serif' computes to ['italic normal 700 ultra-expanded 33.3333px/normal sans-serif' or 'italic normal 700 ultra-expanded 33.3333px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value '100 semi-expanded normal italic medium/normal monospace' computes to ['italic normal 100 semi-expanded 13px/normal monospace' or 'italic normal 100 semi-expanded 13px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal italic bolder smaller Menu' computes to ['italic normal 900 normal 33.3333px/normal Menu' or 'italic normal 900 normal 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal extra-expanded larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal normal 400 extra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'normal normal 400 extra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic xx-small "Non-Generic Example Family Name"' computes to ['italic small-caps 400 normal 9px/normal "Non-Generic Example Family Name"' or 'italic small-caps 400 normal 9px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal extra-expanded italic small-caps larger/calc(120% + 1.2em) serif' computes to ['italic small-caps 400 extra-expanded 48px/115.2px serif' or 'italic small-caps 400 extra-expanded 48px / 115.2px serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic expanded normal bolder xx-large/1.2 "Non-Generic Example Family Name"' computes to ['italic normal 900 expanded 32px/38.4px "Non-Generic Example Family Name"' or 'italic normal 900 expanded 32px / 38.4px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps extra-expanded lighter normal larger/calc(120% + 1.2em) serif' computes to ['normal small-caps 700 extra-expanded 48px/115.2px serif' or 'normal small-caps 700 extra-expanded 48px / 115.2px serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic bold ultra-condensed small-caps 10px/normal sans-serif' computes to ['italic small-caps 700 ultra-condensed 10px/normal sans-serif' or 'italic small-caps 700 ultra-condensed 10px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal italic xx-large/1.2 sans-serif' computes to ['italic small-caps 400 normal 32px/38.4px sans-serif' or 'italic small-caps 400 normal 32px / 38.4px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal medium/normal cursive' computes to ['italic small-caps 400 normal 16px/normal cursive' or 'italic small-caps 400 normal 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 100 italic smaller "Non-Generic Example Family Name"' computes to ['italic small-caps 100 normal 33.3333px/normal "Non-Generic Example Family Name"' or 'italic small-caps 100 normal 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value '100 small-caps ultra-expanded normal smaller "Non-Generic Example Family Name"' computes to ['normal small-caps 100 ultra-expanded 33.3333px/normal "Non-Generic Example Family Name"' or 'normal small-caps 100 ultra-expanded 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value '900 normal italic extra-condensed calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to ['italic normal 900 extra-condensed 0px/0px Menu' or 'italic normal 900 extra-condensed 0px / 0px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic extra-expanded small-caps 10px/normal fantasy' computes to ['italic small-caps 400 extra-expanded 10px/normal fantasy' or 'italic small-caps 400 extra-expanded 10px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic normal medium/normal serif' computes to ['italic small-caps 400 normal 16px/normal serif' or 'italic small-caps 400 normal 16px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to ['normal small-caps 400 normal 0px/0px Menu' or 'normal small-caps 400 normal 0px / 0px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed bolder normal italic 10px/normal serif' computes to ['italic normal 900 ultra-condensed 10px/normal serif' or 'italic normal 900 ultra-condensed 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps bolder 10px/normal "Non-Generic Example Family Name"' computes to ['italic small-caps 900 normal 10px/normal "Non-Generic Example Family Name"' or 'italic small-caps 900 normal 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal 100 normal ultra-expanded 20%/1.2 serif' computes to ['normal normal 100 ultra-expanded 8px/9.6px serif' or 'normal normal 100 ultra-expanded 8px / 9.6px serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal bolder italic small-caps medium/normal fantasy' computes to ['italic small-caps 900 normal 16px/normal fantasy' or 'italic small-caps 900 normal 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'bold normal small-caps xx-small "Non-Generic Example Family Name"' computes to ['normal small-caps 700 normal 9px/normal "Non-Generic Example Family Name"' or 'normal small-caps 700 normal 9px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps bold 10px/normal cursive' computes to ['italic small-caps 700 normal 10px/normal cursive' or 'italic small-caps 700 normal 10px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps xx-small sans-serif' computes to ['italic small-caps 400 normal 9px/normal sans-serif' or 'italic small-caps 400 normal 9px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal 100 calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['italic small-caps 100 normal 0px/0px serif' or 'italic small-caps 100 normal 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'bolder small-caps normal normal 10px/normal "Non-Generic Example Family Name"' computes to ['normal small-caps 900 normal 10px/normal "Non-Generic Example Family Name"' or 'normal small-caps 900 normal 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded italic bold smaller monospace' computes to ['italic normal 700 ultra-expanded 33.3333px/normal monospace' or 'italic normal 700 ultra-expanded 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal normal xx-large/1.2 fantasy' computes to ['italic small-caps 400 normal 32px/38.4px fantasy' or 'italic small-caps 400 normal 32px / 38.4px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic lighter normal normal 10px/normal serif' computes to ['italic normal 700 normal 10px/normal serif' or 'italic normal 700 normal 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps expanded xx-large/1.2 Menu' computes to ['normal small-caps 400 expanded 32px/38.4px Menu' or 'normal small-caps 400 expanded 32px / 38.4px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed lighter normal small-caps 20%/1.2 sans-serif' computes to ['normal small-caps 700 extra-condensed 8px/9.6px sans-serif' or 'normal small-caps 700 extra-condensed 8px / 9.6px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps smaller fantasy' computes to ['italic small-caps 400 normal 33.3333px/normal fantasy' or 'italic small-caps 400 normal 33.3333px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal bolder small-caps 20%/1.2 sans-serif' computes to ['normal small-caps 900 normal 8px/9.6px sans-serif' or 'normal small-caps 900 normal 8px / 9.6px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic normal 900 medium/normal Menu' computes to ['italic normal 900 normal 16px/normal Menu' or 'italic normal 900 normal 16px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal expanded italic normal xx-large/1.2 "Non-Generic Example Family Name"' computes to ['italic normal 400 expanded 32px/38.4px "Non-Generic Example Family Name"' or 'italic normal 400 expanded 32px / 38.4px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal bolder normal medium/normal sans-serif' computes to ['italic normal 900 normal 16px/normal sans-serif' or 'italic normal 900 normal 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic lighter calc(30% - 40px)/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['italic small-caps 700 normal 0px/0px "Non-Generic Example Family Name"' or 'italic small-caps 700 normal 0px / 0px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps bold italic larger/calc(120% + 1.2em) fantasy' computes to ['italic small-caps 700 normal 48px/115.2px fantasy' or 'italic small-caps 700 normal 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic 900 ultra-expanded normal smaller serif' computes to ['italic normal 900 ultra-expanded 33.3333px/normal serif' or 'italic normal 900 ultra-expanded 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed small-caps italic 900 20%/1.2 serif' computes to ['italic small-caps 900 extra-condensed 8px/9.6px serif' or 'italic small-caps 900 extra-condensed 8px / 9.6px serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal bold xx-small serif' computes to ['italic normal 700 normal 9px/normal serif' or 'italic normal 700 normal 9px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal 900 semi-expanded italic medium/normal monospace' computes to ['italic normal 900 semi-expanded 13px/normal monospace' or 'italic normal 900 semi-expanded 13px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic extra-expanded small-caps larger/calc(120% + 1.2em) serif' computes to ['italic small-caps 400 extra-expanded 48px/115.2px serif' or 'italic small-caps 400 extra-expanded 48px / 115.2px serif'\]]
+    expected: FAIL
+
+  [Property font value 'bolder normal expanded italic 20%/1.2 Menu' computes to ['italic normal 900 expanded 8px/9.6px Menu' or 'italic normal 900 expanded 8px / 9.6px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps extra-condensed calc(30% - 40px)/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['italic small-caps 400 extra-condensed 0px/0px "Non-Generic Example Family Name"' or 'italic small-caps 400 extra-condensed 0px / 0px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps condensed 20%/1.2 fantasy' computes to ['italic small-caps 400 condensed 8px/9.6px fantasy' or 'italic small-caps 400 condensed 8px / 9.6px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps lighter normal 20%/1.2 serif' computes to ['italic small-caps 700 normal 8px/9.6px serif' or 'italic small-caps 700 normal 8px / 9.6px serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic condensed 900 normal calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to ['italic normal 900 condensed 0px/0px monospace' or 'italic normal 900 condensed 0px / 0px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'xx-small serif' computes to ['normal normal 400 normal 9px/normal serif' or 'normal normal 400 normal 9px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal bolder 20%/1.2 monospace' computes to ['normal small-caps 900 normal 8px/9.6px monospace' or 'normal small-caps 900 normal 8px / 9.6px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal 900 small-caps normal smaller "Non-Generic Example Family Name"' computes to ['normal small-caps 900 normal 33.3333px/normal "Non-Generic Example Family Name"' or 'normal small-caps 900 normal 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal condensed normal small-caps calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to ['normal small-caps 400 condensed 0px/0px fantasy' or 'normal small-caps 400 condensed 0px / 0px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal extra-expanded italic xx-large/1.2 Menu' computes to ['italic normal 400 extra-expanded 32px/38.4px Menu' or 'italic normal 400 extra-expanded 32px / 38.4px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic smaller monospace' computes to ['italic small-caps 400 normal 33.3333px/normal monospace' or 'italic small-caps 400 normal 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bold italic small-caps ultra-condensed calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['italic small-caps 700 ultra-condensed 0px/0px serif' or 'italic small-caps 700 ultra-condensed 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'bold extra-expanded italic larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['italic normal 700 extra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'italic normal 700 extra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic lighter normal xx-small Menu' computes to ['italic normal 700 normal 9px/normal Menu' or 'italic normal 700 normal 9px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps larger/calc(120% + 1.2em) serif' computes to ['italic small-caps 400 normal 48px/115.2px serif' or 'italic small-caps 400 normal 48px / 115.2px serif'\]]
+    expected: FAIL
+
+  [Property font value 'lighter semi-condensed normal normal xx-small fantasy' computes to ['normal normal 700 semi-condensed 9px/normal fantasy' or 'normal normal 700 semi-condensed 9px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'lighter normal extra-expanded small-caps calc(30% - 40px)/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal small-caps 700 extra-expanded 0px/0px "Non-Generic Example Family Name"' or 'normal small-caps 700 extra-expanded 0px / 0px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic lighter xx-large/1.2 sans-serif' computes to ['italic small-caps 700 normal 32px/38.4px sans-serif' or 'italic small-caps 700 normal 32px / 38.4px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed small-caps bolder normal xx-small cursive' computes to ['normal small-caps 900 semi-condensed 9px/normal cursive' or 'normal small-caps 900 semi-condensed 9px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal semi-expanded calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to ['normal small-caps 400 semi-expanded 0px/0px Menu' or 'normal small-caps 400 semi-expanded 0px / 0px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal condensed lighter larger/calc(120% + 1.2em) fantasy' computes to ['normal small-caps 700 condensed 48px/115.2px fantasy' or 'normal small-caps 700 condensed 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded italic small-caps medium/normal sans-serif' computes to ['italic small-caps 400 semi-expanded 16px/normal sans-serif' or 'italic small-caps 400 semi-expanded 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal extra-condensed small-caps normal 20%/1.2 fantasy' computes to ['normal small-caps 400 extra-condensed 8px/9.6px fantasy' or 'normal small-caps 400 extra-condensed 8px / 9.6px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal medium/normal sans-serif' computes to ['normal normal 400 normal 16px/normal sans-serif' or 'normal normal 400 normal 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed small-caps normal xx-small sans-serif' computes to ['normal small-caps 400 semi-condensed 9px/normal sans-serif' or 'normal small-caps 400 semi-condensed 9px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal bold italic 10px/normal serif' computes to ['italic normal 700 normal 10px/normal serif' or 'italic normal 700 normal 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps 100 ultra-condensed calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['italic small-caps 100 ultra-condensed 0px/0px sans-serif' or 'italic small-caps 100 ultra-condensed 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps lighter normal ultra-condensed larger/calc(120% + 1.2em) Menu' computes to ['normal small-caps 700 ultra-condensed 48px/115.2px Menu' or 'normal small-caps 700 ultra-condensed 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps bolder condensed calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['normal small-caps 900 condensed 0px/0px cursive' or 'normal small-caps 900 condensed 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal lighter small-caps xx-large/1.2 cursive' computes to ['italic small-caps 700 normal 32px/38.4px cursive' or 'italic small-caps 700 normal 32px / 38.4px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed italic normal 100 xx-small serif' computes to ['italic normal 100 semi-condensed 9px/normal serif' or 'italic normal 100 semi-condensed 9px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps 100 medium/normal sans-serif' computes to ['normal small-caps 100 normal 16px/normal sans-serif' or 'normal small-caps 100 normal 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal semi-condensed smaller monospace' computes to ['italic normal 400 semi-condensed 33.3333px/normal monospace' or 'italic normal 400 semi-condensed 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic normal extra-condensed xx-large/1.2 "Non-Generic Example Family Name"' computes to ['italic normal 400 extra-condensed 32px/38.4px "Non-Generic Example Family Name"' or 'italic normal 400 extra-condensed 32px / 38.4px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded normal lighter small-caps larger/calc(120% + 1.2em) cursive' computes to ['normal small-caps 700 extra-expanded 48px/115.2px cursive' or 'normal small-caps 700 extra-expanded 48px / 115.2px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'expanded normal xx-large/1.2 "Non-Generic Example Family Name"' computes to ['normal normal 400 expanded 32px/38.4px "Non-Generic Example Family Name"' or 'normal normal 400 expanded 32px / 38.4px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps bolder normal italic xx-large/1.2 monospace' computes to ['italic small-caps 900 normal 26px/31.2px monospace' or 'italic small-caps 900 normal 26px / 31.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed normal small-caps italic 20%/1.2 monospace' computes to ['italic small-caps 400 extra-condensed 8px/9.6px monospace' or 'italic small-caps 400 extra-condensed 8px / 9.6px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps 20%/1.2 serif' computes to ['normal small-caps 400 normal 8px/9.6px serif' or 'normal small-caps 400 normal 8px / 9.6px serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps condensed xx-large/1.2 monospace' computes to ['normal small-caps 400 condensed 26px/31.2px monospace' or 'normal small-caps 400 condensed 26px / 31.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal 100 condensed larger/calc(120% + 1.2em) fantasy' computes to ['italic normal 100 condensed 48px/115.2px fantasy' or 'italic normal 100 condensed 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic ultra-expanded bold 20%/1.2 monospace' computes to ['italic normal 700 ultra-expanded 8px/9.6px monospace' or 'italic normal 700 ultra-expanded 8px / 9.6px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic ultra-expanded lighter 20%/1.2 serif' computes to ['italic small-caps 700 ultra-expanded 8px/9.6px serif' or 'italic small-caps 700 ultra-expanded 8px / 9.6px serif'\]]
+    expected: FAIL
+
+  [Property font value 'bolder small-caps italic expanded xx-large/1.2 monospace' computes to ['italic small-caps 900 expanded 26px/31.2px monospace' or 'italic small-caps 900 expanded 26px / 31.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded bold normal normal smaller "Non-Generic Example Family Name"' computes to ['normal normal 700 ultra-expanded 33.3333px/normal "Non-Generic Example Family Name"' or 'normal normal 700 ultra-expanded 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'bold normal normal ultra-condensed larger/calc(120% + 1.2em) sans-serif' computes to ['normal normal 700 ultra-condensed 48px/115.2px sans-serif' or 'normal normal 700 ultra-condensed 48px / 115.2px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'expanded small-caps normal italic xx-large/1.2 fantasy' computes to ['italic small-caps 400 expanded 32px/38.4px fantasy' or 'italic small-caps 400 expanded 32px / 38.4px fantasy'\]]
+    expected: FAIL
+
+  [Property font value '100 italic semi-condensed small-caps xx-large/1.2 fantasy' computes to ['italic small-caps 100 semi-condensed 32px/38.4px fantasy' or 'italic small-caps 100 semi-condensed 32px / 38.4px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed italic normal normal 20%/1.2 Menu' computes to ['italic normal 400 extra-condensed 8px/9.6px Menu' or 'italic normal 400 extra-condensed 8px / 9.6px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal xx-large/1.2 serif' computes to ['normal small-caps 400 normal 32px/38.4px serif' or 'normal small-caps 400 normal 32px / 38.4px serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps italic xx-small cursive' computes to ['italic small-caps 400 normal 9px/normal cursive' or 'italic small-caps 400 normal 9px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal expanded normal medium/normal monospace' computes to ['normal normal 400 expanded 13px/normal monospace' or 'normal normal 400 expanded 13px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal condensed small-caps italic calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to ['italic small-caps 400 condensed 0px/0px monospace' or 'italic small-caps 400 condensed 0px / 0px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'lighter normal italic normal 10px/normal fantasy' computes to ['italic normal 700 normal 10px/normal fantasy' or 'italic normal 700 normal 10px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic bolder normal smaller "Non-Generic Example Family Name"' computes to ['italic normal 900 normal 33.3333px/normal "Non-Generic Example Family Name"' or 'italic normal 900 normal 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'lighter small-caps normal italic 20%/1.2 serif' computes to ['italic small-caps 700 normal 8px/9.6px serif' or 'italic small-caps 700 normal 8px / 9.6px serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic expanded normal smaller cursive' computes to ['italic normal 400 expanded 33.3333px/normal cursive' or 'italic normal 400 expanded 33.3333px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded lighter small-caps normal larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal small-caps 700 extra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'normal small-caps 700 extra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic normal 20%/1.2 cursive' computes to ['italic normal 400 normal 8px/9.6px cursive' or 'italic normal 400 normal 8px / 9.6px cursive'\]]
+    expected: FAIL
+
+  [Property font value '100 small-caps normal semi-expanded calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['normal small-caps 100 semi-expanded 0px/0px sans-serif' or 'normal small-caps 100 semi-expanded 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic normal small-caps xx-small monospace' computes to ['italic small-caps 400 normal 9px/normal monospace' or 'italic small-caps 400 normal 9px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps ultra-condensed normal italic 10px/normal sans-serif' computes to ['italic small-caps 400 ultra-condensed 10px/normal sans-serif' or 'italic small-caps 400 ultra-condensed 10px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal ultra-condensed xx-small sans-serif' computes to ['normal normal 400 ultra-condensed 9px/normal sans-serif' or 'normal normal 400 ultra-condensed 9px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps bold italic extra-condensed 20%/1.2 sans-serif' computes to ['italic small-caps 700 extra-condensed 8px/9.6px sans-serif' or 'italic small-caps 700 extra-condensed 8px / 9.6px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal 900 normal 10px/normal monospace' computes to ['normal small-caps 900 normal 10px/normal monospace' or 'normal small-caps 900 normal 10px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'expanded 100 xx-large/1.2 monospace' computes to ['normal normal 100 expanded 26px/31.2px monospace' or 'normal normal 100 expanded 26px / 31.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal bold expanded small-caps xx-large/1.2 Menu' computes to ['normal small-caps 700 expanded 32px/38.4px Menu' or 'normal small-caps 700 expanded 32px / 38.4px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal ultra-condensed 100 smaller serif' computes to ['normal normal 100 ultra-condensed 33.3333px/normal serif' or 'normal normal 100 ultra-condensed 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic 900 normal semi-expanded calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['italic normal 900 semi-expanded 0px/0px cursive' or 'italic normal 900 semi-expanded 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps ultra-expanded normal normal smaller serif' computes to ['normal small-caps 400 ultra-expanded 33.3333px/normal serif' or 'normal small-caps 400 ultra-expanded 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps bolder condensed smaller monospace' computes to ['normal small-caps 900 condensed 33.3333px/normal monospace' or 'normal small-caps 900 condensed 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal ultra-expanded small-caps larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal small-caps 400 ultra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'normal small-caps 400 ultra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal ultra-expanded smaller Menu' computes to ['italic small-caps 400 ultra-expanded 33.3333px/normal Menu' or 'italic small-caps 400 ultra-expanded 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic 100 normal small-caps 20%/1.2 sans-serif' computes to ['italic small-caps 100 normal 8px/9.6px sans-serif' or 'italic small-caps 100 normal 8px / 9.6px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal semi-expanded italic medium/normal Menu' computes to ['italic normal 400 semi-expanded 16px/normal Menu' or 'italic normal 400 semi-expanded 16px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal semi-expanded 900 medium/normal "Non-Generic Example Family Name"' computes to ['normal normal 900 semi-expanded 16px/normal "Non-Generic Example Family Name"' or 'normal normal 900 semi-expanded 16px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value '900 condensed small-caps normal calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to ['normal small-caps 900 condensed 0px/0px fantasy' or 'normal small-caps 900 condensed 0px / 0px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal bold normal normal larger/calc(120% + 1.2em) monospace' computes to ['normal normal 700 normal 48px/115.2px monospace' or 'normal normal 700 normal 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal 900 normal smaller "Non-Generic Example Family Name"' computes to ['normal normal 900 normal 33.3333px/normal "Non-Generic Example Family Name"' or 'normal normal 900 normal 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic ultra-condensed small-caps lighter 10px/normal cursive' computes to ['italic small-caps 700 ultra-condensed 10px/normal cursive' or 'italic small-caps 700 ultra-condensed 10px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal bold larger/calc(120% + 1.2em) monospace' computes to ['italic small-caps 700 normal 48px/115.2px monospace' or 'italic small-caps 700 normal 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed 900 italic normal xx-small fantasy' computes to ['italic normal 900 semi-condensed 9px/normal fantasy' or 'italic normal 900 semi-condensed 9px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps lighter medium/normal fantasy' computes to ['normal small-caps 700 normal 16px/normal fantasy' or 'normal small-caps 700 normal 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps medium/normal "Non-Generic Example Family Name"' computes to ['normal small-caps 400 normal 16px/normal "Non-Generic Example Family Name"' or 'normal small-caps 400 normal 16px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal bolder extra-expanded calc(30% - 40px)/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal small-caps 900 extra-expanded 0px/0px "Non-Generic Example Family Name"' or 'normal small-caps 900 extra-expanded 0px / 0px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'condensed small-caps bold calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['normal small-caps 700 condensed 0px/0px sans-serif' or 'normal small-caps 700 condensed 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal semi-condensed normal bolder xx-small monospace' computes to ['normal normal 900 semi-condensed 9px/normal monospace' or 'normal normal 900 semi-condensed 9px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal normal 100 xx-large/1.2 sans-serif' computes to ['italic normal 100 normal 32px/38.4px sans-serif' or 'italic normal 100 normal 32px / 38.4px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded medium/normal Menu' computes to ['normal normal 400 semi-expanded 16px/normal Menu' or 'normal normal 400 semi-expanded 16px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 100 calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['normal small-caps 100 normal 0px/0px sans-serif' or 'normal small-caps 100 normal 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal 900 normal xx-large/1.2 fantasy' computes to ['normal normal 900 normal 32px/38.4px fantasy' or 'normal normal 900 normal 32px / 38.4px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps semi-condensed 900 xx-large/1.2 monospace' computes to ['italic small-caps 900 semi-condensed 26px/31.2px monospace' or 'italic small-caps 900 semi-condensed 26px / 31.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed normal normal small-caps 20%/1.2 fantasy' computes to ['normal small-caps 400 extra-condensed 8px/9.6px fantasy' or 'normal small-caps 400 extra-condensed 8px / 9.6px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic normal 20%/1.2 Menu' computes to ['italic small-caps 400 normal 8px/9.6px Menu' or 'italic small-caps 400 normal 8px / 9.6px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps semi-condensed 10px/normal Menu' computes to ['normal small-caps 400 semi-condensed 10px/normal Menu' or 'normal small-caps 400 semi-condensed 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps extra-expanded normal larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal small-caps 400 extra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'normal small-caps 400 extra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded bold italic small-caps medium/normal monospace' computes to ['italic small-caps 700 semi-expanded 12px/normal monospace' or 'italic small-caps 700 semi-expanded 12px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps semi-condensed italic normal xx-small monospace' computes to ['italic small-caps 400 semi-condensed 9px/normal monospace' or 'italic small-caps 400 semi-condensed 9px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal ultra-condensed normal medium/normal sans-serif' computes to ['normal small-caps 400 ultra-condensed 16px/normal sans-serif' or 'normal small-caps 400 ultra-condensed 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps semi-condensed 900 xx-large/1.2 monospace' computes to ['italic small-caps 900 semi-condensed 24px/28.8px monospace' or 'italic small-caps 900 semi-condensed 24px / 28.8px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal xx-small "Non-Generic Example Family Name"' computes to ['normal small-caps 400 normal 9px/normal "Non-Generic Example Family Name"' or 'normal small-caps 400 normal 9px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal larger/calc(120% + 1.2em) sans-serif' computes to ['normal small-caps 400 normal 48px/115.2px sans-serif' or 'normal small-caps 400 normal 48px / 115.2px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal extra-condensed normal italic 20%/1.2 cursive' computes to ['italic normal 400 extra-condensed 8px/9.6px cursive' or 'italic normal 400 extra-condensed 8px / 9.6px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'bolder normal normal calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to ['normal normal 900 normal 0px/0px monospace' or 'normal normal 900 normal 0px / 0px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal ultra-expanded normal smaller serif' computes to ['normal normal 400 ultra-expanded 33.3333px/normal serif' or 'normal normal 400 ultra-expanded 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps extra-expanded lighter xx-small sans-serif' computes to ['normal small-caps 700 extra-expanded 9px/normal sans-serif' or 'normal small-caps 700 extra-expanded 9px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal bolder normal italic smaller Menu' computes to ['italic normal 900 normal 33.3333px/normal Menu' or 'italic normal 900 normal 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value '100 normal normal italic medium/normal "Non-Generic Example Family Name"' computes to ['italic normal 100 normal 16px/normal "Non-Generic Example Family Name"' or 'italic normal 100 normal 16px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal bold small-caps italic 10px/normal serif' computes to ['italic small-caps 700 normal 10px/normal serif' or 'italic small-caps 700 normal 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic bold larger/calc(120% + 1.2em) Menu' computes to ['italic normal 700 normal 48px/115.2px Menu' or 'italic normal 700 normal 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded small-caps normal 100 larger/calc(120% + 1.2em) monospace' computes to ['normal small-caps 100 extra-expanded 48px/115.2px monospace' or 'normal small-caps 100 extra-expanded 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal 100 small-caps larger/calc(120% + 1.2em) Menu' computes to ['normal small-caps 100 normal 48px/115.2px Menu' or 'normal small-caps 100 normal 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic expanded larger/calc(120% + 1.2em) cursive' computes to ['italic small-caps 400 expanded 48px/115.2px cursive' or 'italic small-caps 400 expanded 48px / 115.2px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'bold normal 20%/1.2 fantasy' computes to ['normal normal 700 normal 8px/9.6px fantasy' or 'normal normal 700 normal 8px / 9.6px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal semi-expanded normal 10px/normal Menu' computes to ['italic normal 400 semi-expanded 10px/normal Menu' or 'italic normal 400 semi-expanded 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal bold calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['normal normal 700 normal 0px/0px serif' or 'normal normal 700 normal 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal 900 italic calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['italic normal 900 normal 0px/0px sans-serif' or 'italic normal 900 normal 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded small-caps normal normal medium/normal cursive' computes to ['normal small-caps 400 semi-expanded 16px/normal cursive' or 'normal small-caps 400 semi-expanded 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal italic medium/normal cursive' computes to ['italic normal 400 normal 16px/normal cursive' or 'italic normal 400 normal 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal 20%/1.2 monospace' computes to ['italic normal 400 normal 8px/9.6px monospace' or 'italic normal 400 normal 8px / 9.6px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'condensed small-caps calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['normal small-caps 400 condensed 0px/0px serif' or 'normal small-caps 400 condensed 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'bold italic normal normal xx-large/1.2 cursive' computes to ['italic normal 700 normal 32px/38.4px cursive' or 'italic normal 700 normal 32px / 38.4px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal normal calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to ['italic normal 400 normal 0px/0px Menu' or 'italic normal 400 normal 0px / 0px Menu'\]]
+    expected: FAIL
+
+  [Property font value '900 normal semi-condensed smaller fantasy' computes to ['normal normal 900 semi-condensed 33.3333px/normal fantasy' or 'normal normal 900 semi-condensed 33.3333px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value '900 small-caps ultra-condensed italic 10px/normal serif' computes to ['italic small-caps 900 ultra-condensed 10px/normal serif' or 'italic small-caps 900 ultra-condensed 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value '100 normal italic small-caps 20%/1.2 monospace' computes to ['italic small-caps 100 normal 8px/9.6px monospace' or 'italic small-caps 100 normal 8px / 9.6px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps extra-condensed xx-small cursive' computes to ['italic small-caps 400 extra-condensed 9px/normal cursive' or 'italic small-caps 400 extra-condensed 9px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal bold italic 20%/1.2 Menu' computes to ['italic small-caps 700 normal 8px/9.6px Menu' or 'italic small-caps 700 normal 8px / 9.6px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic 900 semi-condensed xx-large/1.2 serif' computes to ['italic normal 900 semi-condensed 32px/38.4px serif' or 'italic normal 900 semi-condensed 32px / 38.4px serif'\]]
+    expected: FAIL
+
+  [Property font value 'lighter small-caps extra-expanded larger/calc(120% + 1.2em) Menu' computes to ['normal small-caps 700 extra-expanded 48px/115.2px Menu' or 'normal small-caps 700 extra-expanded 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic 10px/normal fantasy' computes to ['italic normal 400 normal 10px/normal fantasy' or 'italic normal 400 normal 10px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic 100 small-caps medium/normal "Non-Generic Example Family Name"' computes to ['italic small-caps 100 normal 16px/normal "Non-Generic Example Family Name"' or 'italic small-caps 100 normal 16px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic ultra-expanded small-caps normal smaller sans-serif' computes to ['italic small-caps 400 ultra-expanded 33.3333px/normal sans-serif' or 'italic small-caps 400 ultra-expanded 33.3333px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps bold normal normal medium/normal fantasy' computes to ['normal small-caps 700 normal 16px/normal fantasy' or 'normal small-caps 700 normal 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal 100 larger/calc(120% + 1.2em) Menu' computes to ['normal normal 100 normal 48px/115.2px Menu' or 'normal normal 100 normal 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed normal small-caps normal 10px/normal fantasy' computes to ['normal small-caps 400 ultra-condensed 10px/normal fantasy' or 'normal small-caps 400 ultra-condensed 10px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 900 italic normal 10px/normal serif' computes to ['italic small-caps 900 normal 10px/normal serif' or 'italic small-caps 900 normal 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value '900 small-caps italic xx-small cursive' computes to ['italic small-caps 900 normal 9px/normal cursive' or 'italic small-caps 900 normal 9px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal expanded normal medium/normal monospace' computes to ['normal normal 400 expanded 12px/normal monospace' or 'normal normal 400 expanded 12px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'lighter normal normal normal xx-small Menu' computes to ['normal normal 700 normal 9px/normal Menu' or 'normal normal 700 normal 9px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal semi-condensed small-caps 100 xx-small Menu' computes to ['normal small-caps 100 semi-condensed 9px/normal Menu' or 'normal small-caps 100 semi-condensed 9px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 100 semi-expanded italic medium/normal monospace' computes to ['italic small-caps 100 semi-expanded 13px/normal monospace' or 'italic small-caps 100 semi-expanded 13px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'expanded normal italic small-caps xx-large/1.2 serif' computes to ['italic small-caps 400 expanded 32px/38.4px serif' or 'italic small-caps 400 expanded 32px / 38.4px serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded normal italic normal medium/normal "Non-Generic Example Family Name"' computes to ['italic normal 400 semi-expanded 16px/normal "Non-Generic Example Family Name"' or 'italic normal 400 semi-expanded 16px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps condensed italic calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to ['italic small-caps 400 condensed 0px/0px fantasy' or 'italic small-caps 400 condensed 0px / 0px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal ultra-expanded lighter small-caps smaller cursive' computes to ['normal small-caps 700 ultra-expanded 33.3333px/normal cursive' or 'normal small-caps 700 ultra-expanded 33.3333px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded normal bold normal medium/normal serif' computes to ['normal normal 700 semi-expanded 16px/normal serif' or 'normal normal 700 semi-expanded 16px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal extra-condensed italic xx-large/1.2 cursive' computes to ['italic small-caps 400 extra-condensed 32px/38.4px cursive' or 'italic small-caps 400 extra-condensed 32px / 38.4px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps expanded italic calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['italic small-caps 400 expanded 0px/0px serif' or 'italic small-caps 400 expanded 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'lighter italic normal ultra-expanded smaller monospace' computes to ['italic normal 700 ultra-expanded 33.3333px/normal monospace' or 'italic normal 700 ultra-expanded 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic extra-condensed xx-small serif' computes to ['italic small-caps 400 extra-condensed 9px/normal serif' or 'italic small-caps 400 extra-condensed 9px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed italic normal 10px/normal monospace' computes to ['italic normal 400 ultra-condensed 10px/normal monospace' or 'italic normal 400 ultra-condensed 10px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic extra-expanded normal 10px/normal "Non-Generic Example Family Name"' computes to ['italic small-caps 400 extra-expanded 10px/normal "Non-Generic Example Family Name"' or 'italic small-caps 400 extra-expanded 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value '900 expanded normal small-caps xx-large/1.2 Menu' computes to ['normal small-caps 900 expanded 32px/38.4px Menu' or 'normal small-caps 900 expanded 32px / 38.4px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps condensed xx-large/1.2 monospace' computes to ['normal small-caps 400 condensed 24px/28.8px monospace' or 'normal small-caps 400 condensed 24px / 28.8px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded small-caps italic smaller Menu' computes to ['italic small-caps 400 ultra-expanded 33.3333px/normal Menu' or 'italic small-caps 400 ultra-expanded 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'lighter italic condensed normal medium/normal cursive' computes to ['italic normal 700 condensed 16px/normal cursive' or 'italic normal 700 condensed 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal italic extra-condensed 10px/normal "Non-Generic Example Family Name"' computes to ['italic normal 400 extra-condensed 10px/normal "Non-Generic Example Family Name"' or 'italic normal 400 extra-condensed 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed small-caps italic normal 10px/normal "Non-Generic Example Family Name"' computes to ['italic small-caps 400 ultra-condensed 10px/normal "Non-Generic Example Family Name"' or 'italic small-caps 400 ultra-condensed 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'bold small-caps italic normal medium/normal fantasy' computes to ['italic small-caps 700 normal 16px/normal fantasy' or 'italic small-caps 700 normal 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic bold small-caps xx-small fantasy' computes to ['italic small-caps 700 normal 9px/normal fantasy' or 'italic small-caps 700 normal 9px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps 900 normal xx-large/1.2 cursive' computes to ['normal small-caps 900 normal 32px/38.4px cursive' or 'normal small-caps 900 normal 32px / 38.4px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal normal ultra-condensed larger/calc(120% + 1.2em) cursive' computes to ['italic normal 400 ultra-condensed 48px/115.2px cursive' or 'italic normal 400 ultra-condensed 48px / 115.2px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'expanded 100 xx-large/1.2 monospace' computes to ['normal normal 100 expanded 24px/28.8px monospace' or 'normal normal 100 expanded 24px / 28.8px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal 900 semi-expanded italic medium/normal monospace' computes to ['italic normal 900 semi-expanded 12px/normal monospace' or 'italic normal 900 semi-expanded 12px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal expanded small-caps 20%/1.2 "Non-Generic Example Family Name"' computes to ['italic small-caps 400 expanded 8px/9.6px "Non-Generic Example Family Name"' or 'italic small-caps 400 expanded 8px / 9.6px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal normal small-caps medium/normal serif' computes to ['italic small-caps 400 normal 16px/normal serif' or 'italic small-caps 400 normal 16px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal 10px/normal Menu' computes to ['italic small-caps 400 normal 10px/normal Menu' or 'italic small-caps 400 normal 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic 100 extra-expanded larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['italic normal 100 extra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'italic normal 100 extra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic semi-expanded normal small-caps medium/normal Menu' computes to ['italic small-caps 400 semi-expanded 16px/normal Menu' or 'italic small-caps 400 semi-expanded 16px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal small-caps 20%/1.2 "Non-Generic Example Family Name"' computes to ['normal small-caps 400 normal 8px/9.6px "Non-Generic Example Family Name"' or 'normal small-caps 400 normal 8px / 9.6px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic expanded smaller Menu' computes to ['italic small-caps 400 expanded 33.3333px/normal Menu' or 'italic small-caps 400 expanded 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic extra-condensed 100 20%/1.2 fantasy' computes to ['italic normal 100 extra-condensed 8px/9.6px fantasy' or 'italic normal 100 extra-condensed 8px / 9.6px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded normal small-caps smaller cursive' computes to ['normal small-caps 400 ultra-expanded 33.3333px/normal cursive' or 'normal small-caps 400 ultra-expanded 33.3333px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal semi-expanded xx-small fantasy' computes to ['normal normal 400 semi-expanded 9px/normal fantasy' or 'normal normal 400 semi-expanded 9px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic bolder semi-expanded larger/calc(120% + 1.2em) monospace' computes to ['italic small-caps 900 semi-expanded 48px/115.2px monospace' or 'italic small-caps 900 semi-expanded 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'lighter ultra-condensed italic small-caps 10px/normal sans-serif' computes to ['italic small-caps 700 ultra-condensed 10px/normal sans-serif' or 'italic small-caps 700 ultra-condensed 10px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic condensed normal calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to ['italic normal 400 condensed 0px/0px fantasy' or 'italic normal 400 condensed 0px / 0px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal bolder larger/calc(120% + 1.2em) cursive' computes to ['normal small-caps 900 normal 48px/115.2px cursive' or 'normal small-caps 900 normal 48px / 115.2px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic lighter small-caps expanded xx-large/1.2 Menu' computes to ['italic small-caps 700 expanded 32px/38.4px Menu' or 'italic small-caps 700 expanded 32px / 38.4px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'bold small-caps normal smaller Menu' computes to ['normal small-caps 700 normal 33.3333px/normal Menu' or 'normal small-caps 700 normal 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps normal smaller sans-serif' computes to ['italic small-caps 400 normal 33.3333px/normal sans-serif' or 'italic small-caps 400 normal 33.3333px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps expanded bolder xx-large/1.2 "Non-Generic Example Family Name"' computes to ['normal small-caps 900 expanded 32px/38.4px "Non-Generic Example Family Name"' or 'normal small-caps 900 expanded 32px / 38.4px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'condensed italic normal small-caps calc(30% - 40px)/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['italic small-caps 400 condensed 0px/0px "Non-Generic Example Family Name"' or 'italic small-caps 400 condensed 0px / 0px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic semi-condensed normal normal xx-small monospace' computes to ['italic normal 400 semi-condensed 9px/normal monospace' or 'italic normal 400 semi-condensed 9px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic normal normal calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to ['italic normal 400 normal 0px/0px fantasy' or 'italic normal 400 normal 0px / 0px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal extra-expanded 900 calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['italic normal 900 extra-expanded 0px/0px serif' or 'italic normal 900 extra-expanded 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'bolder italic extra-condensed xx-small sans-serif' computes to ['italic normal 900 extra-condensed 9px/normal sans-serif' or 'italic normal 900 extra-condensed 9px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps normal calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['normal small-caps 400 normal 0px/0px sans-serif' or 'normal small-caps 400 normal 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'bolder condensed normal calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['normal normal 900 condensed 0px/0px cursive' or 'normal normal 900 condensed 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic extra-condensed 20%/1.2 cursive' computes to ['italic normal 400 extra-condensed 8px/9.6px cursive' or 'italic normal 400 extra-condensed 8px / 9.6px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'condensed 100 italic calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['italic normal 100 condensed 0px/0px cursive' or 'italic normal 100 condensed 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal bold italic normal xx-small cursive' computes to ['italic normal 700 normal 9px/normal cursive' or 'italic normal 700 normal 9px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic 900 medium/normal cursive' computes to ['italic small-caps 900 normal 16px/normal cursive' or 'italic small-caps 900 normal 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal lighter semi-condensed calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['normal normal 700 semi-condensed 0px/0px cursive' or 'normal normal 700 semi-condensed 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal ultra-condensed small-caps 10px/normal cursive' computes to ['normal small-caps 400 ultra-condensed 10px/normal cursive' or 'normal small-caps 400 ultra-condensed 10px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal 100 semi-condensed normal xx-small fantasy' computes to ['normal normal 100 semi-condensed 9px/normal fantasy' or 'normal normal 100 semi-condensed 9px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal semi-condensed xx-small sans-serif' computes to ['italic small-caps 400 semi-condensed 9px/normal sans-serif' or 'italic small-caps 400 semi-condensed 9px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps bolder normal italic xx-large/1.2 monospace' computes to ['italic small-caps 900 normal 24px/28.8px monospace' or 'italic small-caps 900 normal 24px / 28.8px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'expanded normal bolder italic xx-large/1.2 sans-serif' computes to ['italic normal 900 expanded 32px/38.4px sans-serif' or 'italic normal 900 expanded 32px / 38.4px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal italic small-caps larger/calc(120% + 1.2em) monospace' computes to ['italic small-caps 400 normal 48px/115.2px monospace' or 'italic small-caps 400 normal 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bold semi-condensed small-caps italic xx-small monospace' computes to ['italic small-caps 700 semi-condensed 9px/normal monospace' or 'italic small-caps 700 semi-condensed 9px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal 100 smaller fantasy' computes to ['normal small-caps 100 normal 33.3333px/normal fantasy' or 'normal small-caps 100 normal 33.3333px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal ultra-condensed smaller fantasy' computes to ['normal small-caps 400 ultra-condensed 33.3333px/normal fantasy' or 'normal small-caps 400 ultra-condensed 33.3333px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic bolder calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to ['italic normal 900 normal 0px/0px monospace' or 'italic normal 900 normal 0px / 0px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bold normal semi-expanded normal 10px/normal monospace' computes to ['normal normal 700 semi-expanded 10px/normal monospace' or 'normal normal 700 semi-expanded 10px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps extra-condensed normal 900 20%/1.2 cursive' computes to ['normal small-caps 900 extra-condensed 8px/9.6px cursive' or 'normal small-caps 900 extra-condensed 8px / 9.6px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal lighter normal small-caps 10px/normal "Non-Generic Example Family Name"' computes to ['normal small-caps 700 normal 10px/normal "Non-Generic Example Family Name"' or 'normal small-caps 700 normal 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed normal normal italic 10px/normal cursive' computes to ['italic normal 400 ultra-condensed 10px/normal cursive' or 'italic normal 400 ultra-condensed 10px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'bolder small-caps italic expanded xx-large/1.2 monospace' computes to ['italic small-caps 900 expanded 24px/28.8px monospace' or 'italic small-caps 900 expanded 24px / 28.8px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic semi-expanded larger/calc(120% + 1.2em) sans-serif' computes to ['italic normal 400 semi-expanded 48px/115.2px sans-serif' or 'italic normal 400 semi-expanded 48px / 115.2px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded italic small-caps 900 larger/calc(120% + 1.2em) fantasy' computes to ['italic small-caps 900 extra-expanded 48px/115.2px fantasy' or 'italic small-caps 900 extra-expanded 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded 100 small-caps italic smaller serif' computes to ['italic small-caps 100 ultra-expanded 33.3333px/normal serif' or 'italic small-caps 100 ultra-expanded 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'expanded bolder small-caps xx-large/1.2 Menu' computes to ['normal small-caps 900 expanded 32px/38.4px Menu' or 'normal small-caps 900 expanded 32px / 38.4px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal ultra-expanded xx-small serif' computes to ['normal small-caps 400 ultra-expanded 9px/normal serif' or 'normal small-caps 400 ultra-expanded 9px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value '900 normal normal small-caps xx-large/1.2 serif' computes to ['normal small-caps 900 normal 32px/38.4px serif' or 'normal small-caps 900 normal 32px / 38.4px serif'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded normal italic lighter larger/calc(120% + 1.2em) sans-serif' computes to ['italic normal 700 extra-expanded 48px/115.2px sans-serif' or 'italic normal 700 extra-expanded 48px / 115.2px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value '900 small-caps larger/calc(120% + 1.2em) monospace' computes to ['normal small-caps 900 normal 48px/115.2px monospace' or 'normal small-caps 900 normal 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value '100 italic xx-small serif' computes to ['italic normal 100 normal 9px/normal serif' or 'italic normal 100 normal 9px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal ultra-condensed normal normal 10px/normal sans-serif' computes to ['normal normal 400 ultra-condensed 10px/normal sans-serif' or 'normal normal 400 ultra-condensed 10px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal italic 10px/normal Menu' computes to ['italic normal 400 normal 10px/normal Menu' or 'italic normal 400 normal 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal extra-expanded bolder italic larger/calc(120% + 1.2em) sans-serif' computes to ['italic normal 900 extra-expanded 48px/115.2px sans-serif' or 'italic normal 900 extra-expanded 48px / 115.2px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value '100 semi-expanded normal italic medium/normal monospace' computes to ['italic normal 100 semi-expanded 12px/normal monospace' or 'italic normal 100 semi-expanded 12px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic 10px/normal sans-serif' computes to ['italic normal 400 normal 10px/normal sans-serif' or 'italic normal 400 normal 10px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded small-caps lighter italic medium/normal fantasy' computes to ['italic small-caps 700 semi-expanded 16px/normal fantasy' or 'italic small-caps 700 semi-expanded 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'bolder italic normal small-caps larger/calc(120% + 1.2em) fantasy' computes to ['italic small-caps 900 normal 48px/115.2px fantasy' or 'italic small-caps 900 normal 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value '100 italic small-caps 10px/normal Menu' computes to ['italic small-caps 100 normal 10px/normal Menu' or 'italic small-caps 100 normal 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic bolder small-caps normal medium/normal monospace' computes to ['italic small-caps 900 normal 13px/normal monospace' or 'italic small-caps 900 normal 13px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 900 normal xx-small cursive' computes to ['normal small-caps 900 normal 9px/normal cursive' or 'normal small-caps 900 normal 9px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps ultra-expanded 100 italic smaller sans-serif' computes to ['italic small-caps 100 ultra-expanded 33.3333px/normal sans-serif' or 'italic small-caps 100 ultra-expanded 33.3333px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed italic lighter small-caps 20%/1.2 "Non-Generic Example Family Name"' computes to ['italic small-caps 700 extra-condensed 8px/9.6px "Non-Generic Example Family Name"' or 'italic small-caps 700 extra-condensed 8px / 9.6px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded normal normal normal smaller sans-serif' computes to ['normal normal 400 ultra-expanded 33.3333px/normal sans-serif' or 'normal normal 400 ultra-expanded 33.3333px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps 900 20%/1.2 Menu' computes to ['italic small-caps 900 normal 8px/9.6px Menu' or 'italic small-caps 900 normal 8px / 9.6px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal italic normal xx-large/1.2 fantasy' computes to ['italic normal 400 normal 32px/38.4px fantasy' or 'italic normal 400 normal 32px / 38.4px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal normal medium/normal serif' computes to ['normal small-caps 400 normal 16px/normal serif' or 'normal small-caps 400 normal 16px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal lighter condensed calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['normal normal 700 condensed 0px/0px cursive' or 'normal normal 700 condensed 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 100 semi-expanded italic medium/normal monospace' computes to ['italic small-caps 100 semi-expanded 12px/normal monospace' or 'italic small-caps 100 semi-expanded 12px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal normal smaller monospace' computes to ['normal normal 400 normal 33.3333px/normal monospace' or 'normal normal 400 normal 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal bolder small-caps extra-condensed 20%/1.2 sans-serif' computes to ['normal small-caps 900 extra-condensed 8px/9.6px sans-serif' or 'normal small-caps 900 extra-condensed 8px / 9.6px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal italic 10px/normal fantasy' computes to ['italic small-caps 400 normal 10px/normal fantasy' or 'italic small-caps 400 normal 10px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'condensed normal normal bolder calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to ['normal normal 900 condensed 0px/0px monospace' or 'normal normal 900 condensed 0px / 0px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bolder normal italic smaller cursive' computes to ['italic normal 900 normal 33.3333px/normal cursive' or 'italic normal 900 normal 33.3333px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal larger/calc(120% + 1.2em) fantasy' computes to ['normal normal 400 normal 48px/115.2px fantasy' or 'normal normal 400 normal 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded normal normal larger/calc(120% + 1.2em) serif' computes to ['normal normal 400 extra-expanded 48px/115.2px serif' or 'normal normal 400 extra-expanded 48px / 115.2px serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed normal italic xx-small Menu' computes to ['italic normal 400 semi-condensed 9px/normal Menu' or 'italic normal 400 semi-condensed 9px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal normal normal xx-small "Non-Generic Example Family Name"' computes to ['italic normal 400 normal 9px/normal "Non-Generic Example Family Name"' or 'italic normal 400 normal 9px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value '900 italic normal medium/normal sans-serif' computes to ['italic normal 900 normal 16px/normal sans-serif' or 'italic normal 900 normal 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded italic smaller fantasy' computes to ['italic normal 400 ultra-expanded 33.3333px/normal fantasy' or 'italic normal 400 ultra-expanded 33.3333px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal lighter italic ultra-condensed xx-large/1.2 monospace' computes to ['italic normal 700 ultra-condensed 26px/31.2px monospace' or 'italic normal 700 ultra-condensed 26px / 31.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic 10px/normal monospace' computes to ['italic small-caps 400 normal 10px/normal monospace' or 'italic small-caps 400 normal 10px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bolder ultra-expanded italic normal smaller serif' computes to ['italic normal 900 ultra-expanded 33.3333px/normal serif' or 'italic normal 900 ultra-expanded 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'lighter normal small-caps italic xx-large/1.2 sans-serif' computes to ['italic small-caps 700 normal 32px/38.4px sans-serif' or 'italic small-caps 700 normal 32px / 38.4px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded bold italic small-caps medium/normal monospace' computes to ['italic small-caps 700 semi-expanded 13px/normal monospace' or 'italic small-caps 700 semi-expanded 13px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps lighter semi-condensed normal xx-small fantasy' computes to ['normal small-caps 700 semi-condensed 9px/normal fantasy' or 'normal small-caps 700 semi-condensed 9px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal lighter italic ultra-condensed xx-large/1.2 monospace' computes to ['italic normal 700 ultra-condensed 24px/28.8px monospace' or 'italic normal 700 ultra-condensed 24px / 28.8px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bold extra-condensed 20%/1.2 sans-serif' computes to ['normal normal 700 extra-condensed 8px/9.6px sans-serif' or 'normal normal 700 extra-condensed 8px / 9.6px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps condensed normal medium/normal fantasy' computes to ['italic small-caps 400 condensed 16px/normal fantasy' or 'italic small-caps 400 condensed 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value '100 normal small-caps condensed larger/calc(120% + 1.2em) cursive' computes to ['normal small-caps 100 condensed 48px/115.2px cursive' or 'normal small-caps 100 condensed 48px / 115.2px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps semi-expanded italic bold medium/normal Menu' computes to ['italic small-caps 700 semi-expanded 16px/normal Menu' or 'italic small-caps 700 semi-expanded 16px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed normal 900 xx-small "Non-Generic Example Family Name"' computes to ['normal normal 900 semi-condensed 9px/normal "Non-Generic Example Family Name"' or 'normal normal 900 semi-condensed 9px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal normal 20%/1.2 "Non-Generic Example Family Name"' computes to ['italic small-caps 400 normal 8px/9.6px "Non-Generic Example Family Name"' or 'italic small-caps 400 normal 8px / 9.6px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal expanded bold normal xx-large/1.2 serif' computes to ['normal normal 700 expanded 32px/38.4px serif' or 'normal normal 700 expanded 32px / 38.4px serif'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed italic bolder normal 10px/normal Menu' computes to ['italic normal 900 ultra-condensed 10px/normal Menu' or 'italic normal 900 ultra-condensed 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic bolder small-caps normal medium/normal monospace' computes to ['italic small-caps 900 normal 12px/normal monospace' or 'italic small-caps 900 normal 12px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded 900 normal larger/calc(120% + 1.2em) Menu' computes to ['normal normal 900 extra-expanded 48px/115.2px Menu' or 'normal normal 900 extra-expanded 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'expanded italic small-caps normal xx-large/1.2 cursive' computes to ['italic small-caps 400 expanded 32px/38.4px cursive' or 'italic small-caps 400 expanded 32px / 38.4px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic bold normal xx-large/1.2 fantasy' computes to ['italic small-caps 700 normal 32px/38.4px fantasy' or 'italic small-caps 700 normal 32px / 38.4px fantasy'\]]
+    expected: FAIL
+
+  [Property font value '900 italic small-caps normal 20%/1.2 "Non-Generic Example Family Name"' computes to ['italic small-caps 900 normal 8px/9.6px "Non-Generic Example Family Name"' or 'italic small-caps 900 normal 8px / 9.6px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal 100 medium/normal cursive' computes to ['normal normal 100 normal 16px/normal cursive' or 'normal normal 100 normal 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal normal smaller cursive' computes to ['normal small-caps 400 normal 33.3333px/normal cursive' or 'normal small-caps 400 normal 33.3333px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps semi-expanded normal 20%/1.2 "Non-Generic Example Family Name"' computes to ['normal small-caps 400 semi-expanded 8px/9.6px "Non-Generic Example Family Name"' or 'normal small-caps 400 semi-expanded 8px / 9.6px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value '100 extra-condensed small-caps 20%/1.2 cursive' computes to ['normal small-caps 100 extra-condensed 8px/9.6px cursive' or 'normal small-caps 100 extra-condensed 8px / 9.6px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps normal 10px/normal monospace' computes to ['italic small-caps 400 normal 10px/normal monospace' or 'italic small-caps 400 normal 10px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal xx-large/1.2 cursive' computes to ['normal normal 400 normal 32px/38.4px cursive' or 'normal normal 400 normal 32px / 38.4px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'bolder normal small-caps normal medium/normal serif' computes to ['normal small-caps 900 normal 16px/normal serif' or 'normal small-caps 900 normal 16px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'condensed normal small-caps 100 calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to ['normal small-caps 100 condensed 0px/0px Menu' or 'normal small-caps 100 condensed 0px / 0px Menu'\]]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-[grid-auto-repeat-max-size-001.html]
-  [.grid 9]
-    expected: FAIL
-
-  [.grid 11]
-    expected: FAIL
-
-  [.grid 10]
-    expected: FAIL
-
-  [.grid 12]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-grid/grid-definition/grid-auto-repeat-min-size-001.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,13 +0,0 @@
-[grid-auto-repeat-min-size-001.html]
-  [.grid 9]
-    expected: FAIL
-
-  [.grid 11]
-    expected: FAIL
-
-  [.grid 10]
-    expected: FAIL
-
-  [.grid 12]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-paint-api/non-registered-property-value.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-paint-api/non-registered-property-value.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-paint-api/non-registered-property-value.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-paint-api/non-registered-property-value.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,2 @@
+[non-registered-property-value.https.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-pseudo/first-letter-width.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-pseudo/first-letter-width.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-pseudo/first-letter-width.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-pseudo/first-letter-width.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,2 @@
+[first-letter-width.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-018.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-018.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-018.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-018.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[line-breaking-018.html]
+  expected:
+    if (os == "android") and not e10s: FAIL
+    if (os == "android") and e10s: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-019.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-019.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-019.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-text/line-breaking/line-breaking-019.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[line-breaking-019.html]
+  expected:
+    if (os == "android") and not e10s: FAIL
+    if (os == "android") and e10s: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-text-decor/parsing/text-decoration-computed.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-text-decor/parsing/text-decoration-computed.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-text-decor/parsing/text-decoration-computed.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-text-decor/parsing/text-decoration-computed.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-[text-decoration-computed.html]
-  [Property text-decoration value 'solid' computes to 'none solid rgb(0, 0, 255)']
-    expected: FAIL
-
-  [Property text-decoration value 'underline overline line-through red' computes to 'underline overline line-through solid rgb(255, 0, 0)']
-    expected: FAIL
-
-  [Property text-decoration value 'none' computes to 'none solid rgb(0, 0, 255)']
-    expected: FAIL
-
-  [Property text-decoration value 'line-through' computes to 'line-through solid rgb(0, 0, 255)']
-    expected: FAIL
-
-  [Property text-decoration value 'currentcolor' computes to 'none solid rgb(0, 0, 255)']
-    expected: FAIL
-
-  [Property text-decoration value 'rgba(10, 20, 30, 0.4) dotted' computes to 'none dotted rgba(10, 20, 30, 0.4)']
-    expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-text-decor/text-decoration-serialization.tentative.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-text-decor/text-decoration-serialization.tentative.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-text-decor/text-decoration-serialization.tentative.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-text-decor/text-decoration-serialization.tentative.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[text-decoration-serialization.tentative.html]
-  [text-decoration shorthand serialization]
-    expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-ui/appearance-textfield-001.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-ui/appearance-textfield-001.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-ui/appearance-textfield-001.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-ui/appearance-textfield-001.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -1,7 +1,7 @@
 [appearance-textfield-001.html]
   expected:
-    if (os == "win") and not webrender and debug and (processor == "x86_64"): [FAIL, PASS]
-    if (os == "win") and not webrender and debug and (processor == "x86"): [PASS, FAIL]
-    if (os == "win") and webrender and debug: [FAIL, PASS]
-    if (os == "win") and webrender and not debug: [PASS, FAIL]
-    if (os == "win") and not webrender and not debug: [FAIL, PASS]
+    if (os == "win") and (processor == "x86_64") and webrender and not debug: ["PASS", "FAIL"]
+    if (os == "win") and (processor == "x86_64") and webrender and debug: ["FAIL", "PASS"]
+    if (os == "win") and (processor == "x86_64") and not webrender: ["FAIL", "PASS"]
+    if (os == "win") and (processor == "x86"): ["FAIL", "PASS"]
+    if (os == "win") and (processor == "aarch64"): ["FAIL", "PASS"]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-variables/variable-presentation-attribute.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-variables/variable-presentation-attribute.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/css-variables/variable-presentation-attribute.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/css-variables/variable-presentation-attribute.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -1,9 +1,8 @@
 [variable-presentation-attribute.html]
   [Testing 'clip' on '#test4'.]
     expected:
-      if (os == "win"): PASS
-      if (os == "mac"): PASS
-      FAIL
+      if os == "android": FAIL
+      if os == "linux": FAIL
 
   [Testing 'alignment-baseline'.]
     expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/motion/parsing/offset-path-computed.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/motion/parsing/offset-path-computed.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/motion/parsing/offset-path-computed.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/motion/parsing/offset-path-computed.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,37 @@
+[offset-path-computed.html]
+  [Property offset-path value 'ray(0.25turn closest-corner contain)' computes to 'ray(90deg closest-corner contain)']
+    expected: FAIL
+
+  [Property offset-path value 'path("m 10 20 q 30 60 40 50 q 100 70 90 80")' computes to 'path("M 10 20 Q 40 80 50 70 Q 150 140 140 150")']
+    expected: FAIL
+
+  [Property offset-path value 'ray(270deg farthest-corner contain)' computes to 'ray(270deg farthest-corner contain)']
+    expected: FAIL
+
+  [Property offset-path value 'path("m 10 20 a 10 20 30 1 0 40 50 a 110 120 30 1 1 140 50")' computes to 'path("M 10 20 A 10 20 30 1 0 50 70 A 110 120 30 1 1 190 120")']
+    expected: FAIL
+
+  [Property offset-path value 'ray(calc(180deg - 45deg) farthest-side)' computes to 'ray(calc(135deg) farthest-side)']
+    expected: FAIL
+
+  [Property offset-path value 'ray(0rad closest-side)' computes to 'ray(0deg closest-side)']
+    expected: FAIL
+
+  [Property offset-path value 'path("m 20 0 h -100")' computes to 'path("M 20 0 H -80")']
+    expected: FAIL
+
+  [Property offset-path value 'path("m 10 170 h 90 v 30 m 0 0 s 1 2 3 4 z c 9 8 7 6 5 4")' computes to 'path("M 10 170 H 100 V 200 M 100 200 S 101 202 103 204 Z C 109 208 107 206 105 204")']
+    expected: FAIL
+
+  [Property offset-path value 'ray(200grad farthest-side)' computes to 'ray(180deg farthest-side)']
+    expected: FAIL
+
+  [Property offset-path value 'path("m 10 20 l 20 30 Z l 50 60 Z m 70 80 l 90 60 Z t 70 120")' computes to 'path("M 10 20 L 30 50 Z L 60 80 Z M 80 100 L 170 160 Z T 150 220")']
+    expected: FAIL
+
+  [Property offset-path value 'path("M 0 0 L 100 100 m 0 100 l 100 0 Z l 160 20 Z")' computes to 'path("M 0 0 L 100 100 M 100 200 L 200 200 Z L 260 220 Z")']
+    expected: FAIL
+
+  [Property offset-path value 'ray(-720deg sides)' computes to 'ray(-720deg sides)']
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/motion/parsing/offset-position-computed.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/motion/parsing/offset-position-computed.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/css/motion/parsing/offset-position-computed.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/css/motion/parsing/offset-position-computed.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,43 @@
+[offset-position-computed.html]
+  [Property offset-position value 'top 10px right -20%' computes to '120% 10px']
+    expected: FAIL
+
+  [Property offset-position value 'left 10% bottom 2em' computes to '10% calc(100% - 80px)']
+    expected: FAIL
+
+  [Property offset-position value 'center bottom' computes to '50% 100%']
+    expected: FAIL
+
+  [Property offset-position value 'left -10px top -20%' computes to '-10px -20%']
+    expected: FAIL
+
+  [Property offset-position value '10px 20%' computes to '10px 20%']
+    expected: FAIL
+
+  [Property offset-position value 'calc(10px - 0.5em) calc(10px + 0.5em)' computes to '-10px 30px']
+    expected: FAIL
+
+  [Property offset-position value 'calc(5em + 20%) center' computes to 'calc(20% + 200px) 50%']
+    expected: FAIL
+
+  [Property offset-position value 'right 3em' computes to '100% 120px']
+    expected: FAIL
+
+  [Property offset-position value 'auto' computes to 'auto']
+    expected: FAIL
+
+  [Property offset-position value 'center center' computes to '50% 50%']
+    expected: FAIL
+
+  [Property offset-position value 'right 10% bottom 5em' computes to '90% calc(100% - 200px)']
+    expected: FAIL
+
+  [Property offset-position value 'right center' computes to '100% 50%']
+    expected: FAIL
+
+  [Property offset-position value 'center top' computes to '50% 0%']
+    expected: FAIL
+
+  [Property offset-position value 'left bottom' computes to '0% 100%']
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-backplate-01.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-backplate-02.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-backplate-03.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-backplate-04.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-backplate-05.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-backplate-06.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-backplate-08.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-backplate-09.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-backplate-10.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-01.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-01.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-01.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-01.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-01.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-02.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-02.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-02.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-02.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-02.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-03.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-03.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-03.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-03.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,4 @@
+[forced-colors-mode-03.html]
+  [Checks that default highlighted text style does not get overridden in forced colors mode.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-04.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-04.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-04.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-04.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[forced-colors-mode-04.html]
+  [Checks hyperlinks are overridden in forced colors mode.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-05.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-05.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-05.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-05.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-05.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-06.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-06.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-06.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-06.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-06.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-07.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-07.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-07.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-07.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-07.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-08.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-08.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-08.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-08.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-08.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-09.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-09.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-09.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-09.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[forced-colors-mode-09.html]
+  [Checks that styles defined inside/outside forced-colors are overridden in forced colors mode.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-10.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-10.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-10.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-10.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[forced-colors-mode-10.html]
+  [Checks that styles defined inside/outside forced-colors are preserved in forced colors mode if forced-color-ajust is none.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-11.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-11.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-11.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-11.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,4 @@
+[forced-colors-mode-11.html]
+  [Checks that styles defined in forced-colors are preserved in forced colors mode.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-14.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-14.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-14.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-14.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-14.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-17.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-17.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-17.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-17.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-17.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-18.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-18.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-18.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-18.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-18.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-19.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-19.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-19.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-19.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-19.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-20.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-20.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-20.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-20.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[forced-colors-mode-20.html]
+  [Checks that background color alpha channels are preserved in forced colors mode.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-21.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-21.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-21.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-21.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[forced-colors-mode-21.html]
+  [Checks that background color alpha channels are preserved in forced colors mode at the root node.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-23.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-23.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-23.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/forced-colors-mode/forced-colors-mode-23.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,2 @@
+[forced-colors-mode-23.html]
+  expected: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/geolocation-API/getCurrentPosition_IDL.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/geolocation-API/getCurrentPosition_IDL.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/geolocation-API/getCurrentPosition_IDL.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/geolocation-API/getCurrentPosition_IDL.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -13,3 +13,6 @@
       if os == "android": PASS
       TIMEOUT
 
+  [GeolocationPositionError toString]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/geolocation-API/idlharness.https.window.js.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/geolocation-API/idlharness.https.window.js.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/geolocation-API/idlharness.https.window.js.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/geolocation-API/idlharness.https.window.js.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,136 @@
+[idlharness.https.window.html]
+  [GeolocationPositionError interface: constant PERMISSION_DENIED on interface object]
+    expected: FAIL
+
+  [GeolocationPositionError interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [GeolocationPositionError interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: attribute accuracy]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: attribute latitude]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: attribute heading]
+    expected: FAIL
+
+  [GeolocationCoordinates interface object name]
+    expected: FAIL
+
+  [GeolocationPositionError interface object length]
+    expected: FAIL
+
+  [Geolocation interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [GeolocationPositionError interface: constant PERMISSION_DENIED on interface prototype object]
+    expected: FAIL
+
+  [Geolocation interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Geolocation interface: existence and properties of interface object]
+    expected: FAIL
+
+  [GeolocationPositionError interface: constant POSITION_UNAVAILABLE on interface object]
+    expected: FAIL
+
+  [GeolocationPositionError interface object name]
+    expected: FAIL
+
+  [GeolocationPositionError interface: constant TIMEOUT on interface prototype object]
+    expected: FAIL
+
+  [GeolocationPositionError interface: attribute message]
+    expected: FAIL
+
+  [GeolocationPosition interface object name]
+    expected: FAIL
+
+  [GeolocationPosition interface: existence and properties of interface object]
+    expected: FAIL
+
+  [GeolocationPositionError interface: constant POSITION_UNAVAILABLE on interface prototype object]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [GeolocationCoordinates interface object length]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: attribute altitudeAccuracy]
+    expected: FAIL
+
+  [GeolocationPosition interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [Geolocation must be primary interface of navigator.geolocation]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: attribute altitude]
+    expected: FAIL
+
+  [Geolocation interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: attribute speed]
+    expected: FAIL
+
+  [GeolocationPositionError interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Geolocation interface: operation watchPosition(PositionCallback, PositionErrorCallback, PositionOptions)]
+    expected: FAIL
+
+  [GeolocationPosition interface: attribute coords]
+    expected: FAIL
+
+  [Geolocation interface: operation clearWatch(long)]
+    expected: FAIL
+
+  [Geolocation interface object length]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: attribute longitude]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [GeolocationCoordinates interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [GeolocationPosition interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [GeolocationPositionError interface: constant TIMEOUT on interface object]
+    expected: FAIL
+
+  [GeolocationPositionError interface: attribute code]
+    expected: FAIL
+
+  [Geolocation interface: operation getCurrentPosition(PositionCallback, PositionErrorCallback, PositionOptions)]
+    expected: FAIL
+
+  [GeolocationPosition interface: attribute timestamp]
+    expected: FAIL
+
+  [GeolocationPosition interface object length]
+    expected: FAIL
+
+  [Geolocation interface object name]
+    expected: FAIL
+
+  [GeolocationPositionError interface: existence and properties of interface object]
+    expected: FAIL
+
+  [GeolocationPosition interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/html/semantics/forms/autofocus/no-cross-origin-autofocus.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/html/semantics/forms/autofocus/no-cross-origin-autofocus.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/html/semantics/forms/autofocus/no-cross-origin-autofocus.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/html/semantics/forms/autofocus/no-cross-origin-autofocus.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[no-cross-origin-autofocus.html]
-  [Autofocus shouldn't work in cross-origin iframe]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/html/semantics/forms/autofocus/no-sandboxed-automatic-features.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/html/semantics/forms/autofocus/no-sandboxed-automatic-features.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/html/semantics/forms/autofocus/no-sandboxed-automatic-features.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/html/semantics/forms/autofocus/no-sandboxed-automatic-features.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[no-sandboxed-automatic-features.html]
-  [If the sandboxed automatic features browsing context flag is set, autofocus in the browsing context should not be handled.]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/html/semantics/forms/autofocus/update-the-rendering.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/html/semantics/forms/autofocus/update-the-rendering.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/html/semantics/forms/autofocus/update-the-rendering.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/html/semantics/forms/autofocus/update-the-rendering.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -1,10 +1,12 @@
 [update-the-rendering.html]
   ["Flush autofocus candidates" should be happen after the first animation frame callbacks, and before a resize event in the next iteration of window event loop.]
     expected:
-      if (os == "linux") and not debug and (processor == "x86_64") and webrender: [FAIL, PASS]
-      if (os == "linux") and not debug and (processor == "x86_64") and not webrender: [FAIL, PASS]
-      if (os == "linux") and debug and webrender: [PASS, FAIL]
-      if (os == "linux") and debug and not webrender: [FAIL, PASS]
-      if (os == "win") and debug: [FAIL, PASS]
+      if (os == "linux") and (processor == "x86_64") and debug and not webrender and sw-e10s: ["PASS", "FAIL"]
+      if (os == "linux") and (processor == "x86_64") and debug and not webrender and not sw-e10s: ["FAIL", "PASS"]
+      if (os == "linux") and (processor == "x86_64") and debug and webrender: ["PASS", "FAIL"]
+      if (os == "win") and debug and not webrender and (processor == "x86"): ["FAIL", "PASS"]
+      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["FAIL", "PASS"]
+      if (os == "linux") and (processor == "x86_64") and not debug: ["FAIL", "PASS"]
+      if (os == "win") and debug and webrender: ["FAIL", "PASS"]
       FAIL
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/presentation-markup/operators/embellished-operator-001.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/presentation-markup/operators/embellished-operator-001.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/presentation-markup/operators/embellished-operator-001.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/presentation-markup/operators/embellished-operator-001.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -23,3 +23,27 @@
   [mphantom (embellished operator)]
     expected: FAIL
 
+  [mphantom (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [mpadded (embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [mstyle (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [mpadded (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [mrow (embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [mstyle (embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [mrow (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [mphantom (embellished operator, from in-flow children)]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/presentation-markup/operators/embellished-operator-002.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/presentation-markup/operators/embellished-operator-002.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/presentation-markup/operators/embellished-operator-002.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/presentation-markup/operators/embellished-operator-002.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -29,3 +29,33 @@
   [semantics (embellished operator)]
     expected: FAIL
 
+  [msup (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [maction (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [mfrac (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [semantics (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [munderover (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [msubsup (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [munder (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [msub (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [mmultiscripts (not embellished operator, from in-flow children)]
+    expected: FAIL
+
+  [mover (not embellished operator, from in-flow children)]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/presentation-markup/scripts/cramped-001.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/presentation-markup/scripts/cramped-001.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/presentation-markup/scripts/cramped-001.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/presentation-markup/scripts/cramped-001.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,10 @@
+[cramped-001.html]
+  [accent child of munderover]
+    expected: FAIL
+
+  [accent child of mover]
+    expected: FAIL
+
+  [child of munderover]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/presentation-markup/spaces/space-like-004.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/presentation-markup/spaces/space-like-004.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/presentation-markup/spaces/space-like-004.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/presentation-markup/spaces/space-like-004.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,7 @@
+[space-like-004.html]
+  [complex non-space-like subtree, from in-flow children]
+    expected: FAIL
+
+  [complex space-like subtree, from in-flow children]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -8,3 +8,12 @@
   [onpaste: the content attribute must be compiled into a function as the corresponding property]
     expected: FAIL
 
+  [oncopy: dynamic changes on the attribute]
+    expected: FAIL
+
+  [oncut: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onpaste: dynamic changes on the attribute]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/relations/html5-tree/integration-point-2.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/relations/html5-tree/integration-point-2.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/relations/html5-tree/integration-point-2.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/relations/html5-tree/integration-point-2.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,3 @@
+[integration-point-2.html]
+  fuzzy:
+    if webrender: maxDifference=0-1;totalPixels=0-4
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/relations/html5-tree/math-global-event-handlers.tentative.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/relations/html5-tree/math-global-event-handlers.tentative.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mathml/relations/html5-tree/math-global-event-handlers.tentative.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mathml/relations/html5-tree/math-global-event-handlers.tentative.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -560,3 +560,186 @@
   [MathMLElement GlobalEventHandlers]
     expected: FAIL
 
+  [onkeyup: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onmouseenter: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onwaiting: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onclick: dynamic changes on the attribute]
+    expected: FAIL
+
+  [oncontextmenu: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onmouseup: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onblur: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onformdata: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onkeypress: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onloadstart: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ondragexit: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ondblclick: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onmouseover: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onabort: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onclose: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onplaying: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onratechange: dynamic changes on the attribute]
+    expected: FAIL
+
+  [oninput: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onvolumechange: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onmousemove: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onloadeddata: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ondragover: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onauxclick: dynamic changes on the attribute]
+    expected: FAIL
+
+  [oncanplay: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ontimeupdate: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onended: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onselect: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onfocus: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ondrag: dynamic changes on the attribute]
+    expected: FAIL
+
+  [oncanplaythrough: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ondurationchange: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onmouseleave: dynamic changes on the attribute]
+    expected: FAIL
+
+  [oninvalid: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onloadedmetadata: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onwheel: dynamic changes on the attribute]
+    expected: FAIL
+
+  [oncuechange: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onmouseout: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onstalled: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ondrop: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onemptied: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ondragend: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onseeking: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onplay: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onload: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onmousedown: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ondragstart: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onsubmit: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onreset: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onprogress: dynamic changes on the attribute]
+    expected: FAIL
+
+  [oncancel: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onsecuritypolicyviolation: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onscroll: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onpause: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onsuspend: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onchange: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ontoggle: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onresize: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onkeydown: dynamic changes on the attribute]
+    expected: FAIL
+
+  [onseeked: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ondragleave: dynamic changes on the attribute]
+    expected: FAIL
+
+  [ondragenter: dynamic changes on the attribute]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[opt-in-blocks.https.html]
-  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[opt-in-blocks.https.html]
-  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[opt-in-blocks.https.html]
-  [opt_in_method: http-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[opt-in-blocks.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[opt-in-blocks.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[opt-in-blocks.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[opt-in-blocks.https.html]
-  [opt_in_method: meta-csp\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[opt-in-blocks.https.html]
-  [opt_in_method: meta-csp\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[no-opt-in-blocks.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[no-opt-in-blocks.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[no-opt-in-blocks.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: cross-origin-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[no-opt-in-blocks.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[no-opt-in-blocks.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[no-opt-in-blocks.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-http\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: swap-scheme-redirect\n                                 subresource: classic-data-worker-fetch\n                                 expectation: blocked]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worker-import-data to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-animation to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-audio to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-layout to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-paint to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worker-import-data to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-animation to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-audio to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-layout to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-paint to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.keep-scheme.https.html]
+  [Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-https.no-redirect.https.html]
+  [Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[cross-http.keep-scheme.https.html]
+  [Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.https.html]
+  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[cross-http.swap-scheme.https.html]
+  [Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,4 @@
+[same-http.keep-scheme.https.html]
+  [Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-http.no-redirect.https.html]
+  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-http.swap-scheme.https.html]
+  [Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.https.html]
+  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-http.no-redirect.https.html]
+  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[cross-http.keep-scheme.https.html]
+  [Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -0,0 +1,4 @@
+[cross-http.no-redirect.https.html]
+  [Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[cross-http.swap-scheme.https.html]
+  [Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,4 @@
+[same-http.keep-scheme.https.html]
+  [Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-http.no-redirect.https.html]
+  [Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[same-http.swap-scheme.https.html]
+  [Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: module-data-worker-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: module-data-worker-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: module-data-worker-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: module-data-worker-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: module-data-worker-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-animation-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-animation-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-animation-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-animation-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-animation-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[opt-in-blocks.https.html]
-  disabled:
-    if (os == "linux") and webrender: true
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-animation-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-animation-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-animation-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-animation-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-animation-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-audio-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-audio-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-audio-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-audio-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-audio-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-audio-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-audio-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-audio-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-audio-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-audio-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-layout-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-layout-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-layout-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-layout-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-layout-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-layout-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-layout-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-layout-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-layout-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-layout-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-paint-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-paint-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-paint-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-paint-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-paint-data-import\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-paint-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: http-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-paint-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: meta-csp\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-paint-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: keep-scheme-redirect\n                                 subresource: worklet-paint-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[allowed.https.html]
-  [opt_in_method: no-opt-in\n                                 origin: same-host-https\n                                 source_scheme: https\n                                 context_nesting: top-level\n                                 redirection: no-redirect\n                                 subresource: worklet-paint-top-level\n                                 expectation: allowed]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[opt-in-blocks.https.html]
-  expected:
-    if processor == "aarch64": ["OK", "CRASH"]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mozilla-sync firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mozilla-sync
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/mozilla-sync	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/mozilla-sync	2019-09-15 11:33:23.000000000 +0000
@@ -1,2 +1,2 @@
-local: d5708160f40aacf0705ba4f6ceacf0a34807338e
-upstream: 618253227c854cae40e1f06bcec2377182b26594
+local: 10a3a02f15a94d66d2a9d7815edc236a86751b62
+upstream: 58815a8d4d42a6952bc3d975031562a3de4b2c94
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/orientation-event/idlharness.https.window.js.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/orientation-event/idlharness.https.window.js.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/orientation-event/idlharness.https.window.js.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/orientation-event/idlharness.https.window.js.ini	2019-09-15 11:33:23.000000000 +0000
@@ -2,3 +2,75 @@
   [DeviceMotionEvent interface: new DeviceMotionEvent("foo") must inherit property "interval" with the proper type]
     expected: FAIL
 
+  [DeviceMotionEventAcceleration interface: attribute y]
+    expected: FAIL
+
+  [DeviceMotionEventAcceleration interface: attribute x]
+    expected: FAIL
+
+  [DeviceMotionEventRotationRate interface: existence and properties of interface object]
+    expected: FAIL
+
+  [Window interface: window must inherit property "ondeviceorientationabsolute" with the proper type]
+    expected: FAIL
+
+  [DeviceMotionEventAcceleration interface: attribute z]
+    expected: FAIL
+
+  [DeviceMotionEvent interface: operation requestPermission()]
+    expected: FAIL
+
+  [DeviceMotionEventRotationRate interface: attribute gamma]
+    expected: FAIL
+
+  [DeviceMotionEventRotationRate interface object length]
+    expected: FAIL
+
+  [DeviceOrientationEvent interface: operation requestPermission()]
+    expected: FAIL
+
+  [DeviceMotionEventAcceleration interface object name]
+    expected: FAIL
+
+  [Window interface: attribute oncompassneedscalibration]
+    expected: FAIL
+
+  [DeviceMotionEventAcceleration interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
+  [DeviceMotionEventRotationRate interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [DeviceMotionEventAcceleration interface object length]
+    expected: FAIL
+
+  [DeviceMotionEventRotationRate interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [DeviceMotionEventAcceleration interface: existence and properties of interface prototype object's @@unscopables property]
+    expected: FAIL
+
+  [DeviceMotionEventRotationRate interface: attribute alpha]
+    expected: FAIL
+
+  [DeviceMotionEventAcceleration interface: existence and properties of interface object]
+    expected: FAIL
+
+  [DeviceMotionEventRotationRate interface object name]
+    expected: FAIL
+
+  [DeviceMotionEventAcceleration interface: existence and properties of interface prototype object]
+    expected: FAIL
+
+  [DeviceMotionEventRotationRate interface: attribute beta]
+    expected: FAIL
+
+  [Window interface: window must inherit property "oncompassneedscalibration" with the proper type]
+    expected: FAIL
+
+  [Window interface: attribute ondeviceorientationabsolute]
+    expected: FAIL
+
+  [DeviceMotionEventRotationRate interface: existence and properties of interface prototype object's "constructor" property]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -1,6 +1,7 @@
 [pointerevent_movementxy.html]
   expected:
     if (os == "linux") and webrender and not debug: ["OK", "ERROR"]
+    if (os == "win") and debug and webrender: ["OK", "ERROR"]
     if (os == "mac") and debug: ["OK", "ERROR"]
     [ERROR, OK]
   [mouse pointerevent attributes]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -1,8 +1,12 @@
 [pointerevent_movementxy_with_pointerlock.html]
   [mouse pointerevent movementX/Y with pointerlock test]
     expected:
-      if (os == "linux") and debug and webrender: ["FAIL", "PASS"]
-      if (os == "mac") and debug: ["FAIL", "PASS"]
-      if (os == "mac") and not debug: ["FAIL", "PASS"]
+      if (os == "linux") and debug and not sw-e10s and webrender: ["FAIL", "PASS"]
+      if (os == "win") and (processor == "x86_64") and not webrender and debug: ["FAIL", "PASS"]
+      if (os == "win") and (processor == "x86_64") and webrender and not debug: ["FAIL", "PASS"]
+      if (os == "linux") and not debug and (processor == "x86"): ["FAIL", "PASS"]
+      if (os == "win") and (processor == "x86") and debug: ["FAIL", "PASS"]
+      if (os == "win") and (processor == "aarch64"): ["FAIL", "PASS"]
+      if os == "mac": ["FAIL", "PASS"]
       [PASS, FAIL]
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_pointermove_on_chorded_mouse_button_when_locked.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -2,7 +2,7 @@
   [pointer locked pointermove events received for button state changes]
     expected:
       if ccov and (os == "win"): [PASS, FAIL]
-      if (os == "linux") and debug and webrender: ["PASS", "FAIL"]
+      if (os == "linux") and debug and webrender: ["FAIL", "PASS"]
       if (os == "linux") and debug and not webrender: ["PASS", "FAIL"]
       if (os == "linux") and not debug: ["PASS", "FAIL"]
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/pointerlock/movementX_Y_basic.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/pointerlock/movementX_Y_basic.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/pointerlock/movementX_Y_basic.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/pointerlock/movementX_Y_basic.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -1,4 +1,6 @@
 [movementX_Y_basic.html]
   [Test that movementX/Y = eNow.screenX/Y-ePrevious.screenX/Y.]
-    expected: [PASS, FAIL]
+    expected:
+      if webrender and debug and (os == "linux"): ["FAIL", "PASS"]
+      [PASS, FAIL]
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[iframe-inheritance-srcdoc.html]
-  [Referrer Policy: iframes srdoc correctly inherit the ancestor's referrer policy]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/resource-timing/resource_ignore_failures.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/resource-timing/resource_ignore_failures.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/resource-timing/resource_ignore_failures.html.ini	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/resource-timing/resource_ignore_failures.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[resource_ignore_failures.html]
-  [entries.length == 0]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/resource-timing/status-codes-create-entry.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/resource-timing/status-codes-create-entry.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/resource-timing/status-codes-create-entry.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/resource-timing/status-codes-create-entry.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,13 @@
+[status-codes-create-entry.html]
+  [Make sure all status codes are reported]
+    expected:
+      if (os == "linux") and debug and not sw-e10s and webrender: PASS
+      if (os == "linux") and debug and not sw-e10s and not webrender: ["FAIL", "PASS"]
+      if (os == "win") and not webrender and (processor == "x86_64") and not debug: PASS
+      if (os == "win") and not webrender and (processor == "x86") and debug: PASS
+      if (os == "linux") and not debug and (processor == "x86"): PASS
+      if (os == "linux") and debug and sw-e10s: ["FAIL", "PASS"]
+      if (os == "android") and not debug: PASS
+      if (os == "android") and debug: ["FAIL", "PASS"]
+      [PASS, FAIL]
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/scroll-to-text-fragment/scroll-to-text-fragment.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -29,3 +29,9 @@
   [Test navigation with text fragment anchor #element##targetText=nomatch]
     expected: FAIL
 
+  [Scroll to text is feature detectable via window.location.selector]
+    expected: FAIL
+
+  [Test navigation with text fragment anchor #element##directive]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/service-workers/service-worker/about-blank-replacement.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/service-workers/service-worker/about-blank-replacement.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/service-workers/service-worker/about-blank-replacement.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/service-workers/service-worker/about-blank-replacement.https.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -1,8 +1,5 @@
 [about-blank-replacement.https.html]
   expected: [OK, FAIL]
   [Popup initial about:blank is controlled, exposed to clients.matchAll(), and matches final Client.]
-    expected:
-      if (os == "android") and not debug: ["FAIL", "PASS"]
-      if (os == "mac") and debug: ["FAIL", "PASS"]
-      [PASS, FAIL]
+    expected: [PASS, FAIL]
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/service-workers/service-worker/client-navigate.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/service-workers/service-worker/client-navigate.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/service-workers/service-worker/client-navigate.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/service-workers/service-worker/client-navigate.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -3,30 +3,30 @@
     if (os == "android") and not e10s: https://bugzilla.mozilla.org/show_bug.cgi?id=1499972
     if (os == "android") and e10s: bug 1550895 (frequently fails on geckoview)
   expected:
-    if (os == "mac") and debug: [OK, TIMEOUT]
-    if (os == "mac") and not debug: [TIMEOUT, OK]
+    if (os == "mac") and debug: ["OK", "TIMEOUT"]
+    if (os == "mac") and not debug: ["OK", "TIMEOUT"]
   [Frame location should not update on failed mixed-content navigation]
     expected:
-      if (os == "mac") and debug: [PASS, TIMEOUT, NOTRUN]
-      if (os == "mac") and not debug: [NOTRUN, PASS]
+      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and debug: ["PASS", "TIMEOUT", "NOTRUN"]
 
   [Frame location should update on successful navigation]
     expected:
-      if (os == "mac") and not debug: [TIMEOUT, PASS]
-      if (os == "mac") and debug: [PASS, TIMEOUT]
+      if (os == "mac") and debug: ["PASS", "TIMEOUT"]
+      if (os == "mac") and not debug: ["PASS", "TIMEOUT"]
 
   [Frame location should not be accessible after cross-origin navigation]
     expected:
-      if (os == "mac") and debug: [PASS, NOTRUN]
-      if (os == "mac") and not debug: [NOTRUN, PASS]
+      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
 
   [Frame location should not be accessible after redirect]
     expected:
-      if (os == "mac") and debug: [PASS, NOTRUN]
-      if (os == "mac") and not debug: [NOTRUN, PASS]
+      if (os == "mac") and debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
 
   [Frame location should not update on failed about:blank navigation]
     expected:
-      if (os == "mac") and debug: [PASS, TIMEOUT, NOTRUN]
-      if (os == "mac") and not debug: [NOTRUN, PASS]
+      if (os == "mac") and not debug: ["PASS", "NOTRUN"]
+      if (os == "mac") and debug: ["PASS", "TIMEOUT", "NOTRUN"]
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/service-workers/service-worker/skip-waiting-using-registration.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/service-workers/service-worker/skip-waiting-using-registration.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/service-workers/service-worker/skip-waiting-using-registration.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/service-workers/service-worker/skip-waiting-using-registration.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -7,7 +7,7 @@
     if os == "android": ["OK", "FAIL"]
   [Test skipWaiting while a client is using the registration]
     expected:
-      if (os == "mac") and debug: ["PASS", "FAIL"]
+      if (os == "mac") and debug: ["FAIL", "PASS"]
       if (os == "mac") and not debug: ["PASS", "FAIL"]
       if os == "android": ["PASS", "FAIL"]
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -101,3 +101,6 @@
   [shadowRoot.elementsFromPoint must behave the same with document.elementsFromPoint regarding HTML element]
     expected: FAIL
 
+  [elementsFromPoint should return all elements under a point, even when context object is not connected]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -1,8 +1,8 @@
 [sxg-reporting-prefetch-cert_parse_error-downgraded.tentative.html]
   expected:
     if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.14") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [TIMEOUT, OK]
-    if not debug and (os == "win") and (processor == "aarch64"): [OK, CRASH]
+    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["TIMEOUT", "OK"]
+    if not debug and (os == "win") and (processor == "aarch64"): ["OK", "CRASH"]
     if not debug and (os == "android"): OK
     if debug: OK
     TIMEOUT
@@ -12,8 +12,8 @@
       if debug and not webrender and not e10s and (os == "linux") and (version == "Ubuntu 16.04") and (processor == "x86") and (bits == 32): FAIL
       if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.14") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.14") and (processor == "x86_64") and (bits == 64): TIMEOUT
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["TIMEOUT", "FAIL"]
       if not debug and (os == "linux") and not webrender and (processor == "x86"): TIMEOUT
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [TIMEOUT, FAIL]
       if not debug and (os == "win") and (processor == "x86"): TIMEOUT
       if not debug and (os == "win") and (processor == "x86_64"): TIMEOUT
       if not debug and (os == "linux") and webrender: TIMEOUT
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/signed-exchange/reporting/sxg-reporting-prefetch-invalid_integrity_header.tentative.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -1,8 +1,8 @@
 [sxg-reporting-prefetch-invalid_integrity_header.tentative.html]
   expected:
     if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.14") and (processor == "x86_64") and (bits == 64): TIMEOUT
-    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [TIMEOUT, OK]
-    if not debug and (os == "win") and (processor == "aarch64"): [OK, CRASH]
+    if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["TIMEOUT", "OK"]
+    if not debug and (os == "win") and (processor == "aarch64"): ["OK", "CRASH"]
     if not debug and (os == "android"): OK
     if debug: OK
     TIMEOUT
@@ -13,10 +13,10 @@
       if debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.14") and (processor == "x86_64") and (bits == 64): FAIL
       if not debug and not webrender and e10s and (os == "mac") and (version == "OS X 10.14") and (processor == "x86_64") and (bits == 64): TIMEOUT
       if not debug and (os == "linux") and not webrender and (processor == "x86"): TIMEOUT
-      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): [TIMEOUT, FAIL]
+      if not debug and (os == "linux") and not webrender and (processor == "x86_64"): ["TIMEOUT", "FAIL"]
       if not debug and (os == "linux") and webrender: TIMEOUT
-      if not debug and (os == "win") and (processor == "x86"): TIMEOUT
       if not debug and (os == "win") and (processor == "x86_64"): TIMEOUT
+      if not debug and (os == "win") and (processor == "x86"): TIMEOUT
       if not debug and (os == "mac"): TIMEOUT
       FAIL
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/svg/animations/correct-events-for-short-animations-with-syncbases.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/svg/animations/correct-events-for-short-animations-with-syncbases.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/svg/animations/correct-events-for-short-animations-with-syncbases.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/svg/animations/correct-events-for-short-animations-with-syncbases.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -1,7 +1,8 @@
 [correct-events-for-short-animations-with-syncbases.html]
   [Correct events for short animations with syncbases]
     expected:
-      if (os == "win") and debug and not webrender and (processor == "x86_64"): ["FAIL", "PASS"]
-      if (os == "linux") and (processor == "x86"): PASS
+      if (processor == "x86_64") and (os == "linux") and not debug and not webrender: ["FAIL", "PASS"]
+      if (processor == "x86_64") and (os == "win") and debug: ["FAIL", "PASS"]
+      if (processor == "x86") and (os == "linux"): PASS
       [PASS, FAIL]
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/svg/animations/scripted/onhover-syncbases.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/svg/animations/scripted/onhover-syncbases.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/svg/animations/scripted/onhover-syncbases.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/svg/animations/scripted/onhover-syncbases.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -1,12 +1,13 @@
 [onhover-syncbases.html]
   expected:
     if webrender and debug and (os == "linux"): ["OK", "ERROR"]
-    if webrender and not debug: ["OK", "ERROR"]
+    if webrender and not debug and (os == "linux"): ["OK", "ERROR"]
+    if webrender and not debug and (os == "win"): ["OK", "ERROR"]
   [Check if onhover events reset correctly when triggred multiple times]
     disabled: true
     expected:
-      if webrender and (os == "linux") and not debug: ["FAIL", "TIMEOUT"]
-      if webrender and (os == "linux") and debug: ["FAIL", "PASS", "TIMEOUT"]
-      if webrender and (os == "win") and debug: ["PASS", "TIMEOUT"]
-      if webrender and (os == "win") and not debug: ["PASS", "FAIL", "TIMEOUT"]
+      if webrender and (os == "linux") and not debug: [FAIL, TIMEOUT]
+      if webrender and (os == "linux") and debug: [FAIL, PASS, TIMEOUT]
+      if webrender and (os == "win") and debug: [PASS, TIMEOUT]
+      if webrender and (os == "win") and not debug: [PASS, FAIL, TIMEOUT]
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/svg/animations/slider-switch.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/svg/animations/slider-switch.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/svg/animations/slider-switch.html.ini	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/svg/animations/slider-switch.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -1,7 +1,7 @@
 [slider-switch.html]
   [Check correct event bases for onclick]
     expected:
-      if (os == "android") and not debug: [FAIL, PASS]
-      if (os == "win") and (processor == "aarch64"): [FAIL, PASS]
-      if (os == "mac") and not debug: [FAIL, PASS]
+      if (os == "android") and not debug: ["FAIL", "PASS"]
+      if (os == "win") and (processor == "aarch64"): ["FAIL", "PASS"]
       [PASS, FAIL]
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/user-timing/measure_navigation_timing.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/user-timing/measure_navigation_timing.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/user-timing/measure_navigation_timing.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/user-timing/measure_navigation_timing.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -1,5 +1,5 @@
 [measure_navigation_timing.html]
   [window.performance.getEntriesByName("measure_mark_start_nav_end")[0\].startTime is correct]
     expected:
-      if debug and (os == "linux") and not webrender and not sw-e10s: [PASS, FAIL]
+      if debug and (os == "linux") and not webrender and not sw-e10s: ["PASS", "FAIL"]
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-animations/interfaces/Animatable/animate.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-animations/interfaces/Animatable/animate.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-animations/interfaces/Animatable/animate.html.ini	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-animations/interfaces/Animatable/animate.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -5,3 +5,6 @@
   [Element.animate() accepts a property-indexed keyframes specification with a CSS variable as the property]
     expected: FAIL
 
+  [Element.animate() accepts a two property (one shorthand and one of its shorthand components) two value property-indexed keyframes specification]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/constructor.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/constructor.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/constructor.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/constructor.html.ini	2019-09-15 11:33:22.000000000 +0000
@@ -5,3 +5,6 @@
   [A KeyframeEffect can be constructed with a keyframe sequence with a CSS variable as its property]
     expected: FAIL
 
+  [A KeyframeEffect can be constructed with a two property (one shorthand and one of its shorthand components) two value property-indexed keyframes specification]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/setKeyframes.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/setKeyframes.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/setKeyframes.html.ini	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-animations/interfaces/KeyframeEffect/setKeyframes.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -5,3 +5,6 @@
   [Keyframes can be replaced with a property-indexed keyframes specification with a CSS variable as the property]
     expected: FAIL
 
+  [Keyframes can be replaced with a two property (one shorthand and one of its shorthand components) two value property-indexed keyframes specification]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-animations/timing-model/animations/canceling-an-animation.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-animations/timing-model/animations/canceling-an-animation.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-animations/timing-model/animations/canceling-an-animation.html.ini	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-animations/timing-model/animations/canceling-an-animation.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[canceling-an-animation.html]
-  expected: ERROR
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-addmodule-resolution.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-addmodule-resolution.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-addmodule-resolution.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/webaudio/the-audio-api/the-audioworklet-interface/audioworklet-addmodule-resolution.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[audioworklet-addmodule-resolution.https.html]
+  [\n      Test the invocation order of AudioWorklet.addModule() and BaseAudioContext\n    ]
+    expected:
+        if release_or_beta: FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-nfc/idlharness.https.window.js.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-nfc/idlharness.https.window.js.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-nfc/idlharness.https.window.js.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-nfc/idlharness.https.window.js.ini	2019-09-15 11:33:22.000000000 +0000
@@ -401,9 +401,87 @@
   [NFCReader interface: new NFCReader(); must inherit property "scan(NFCScanOptions)" with the proper type]
     expected: FAIL
 
+  [NDEFRecord must be primary interface of new NDEFRecord({"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"});]
+    expected: FAIL
+
+  [NFCReadingEvent interface: new NFCReadingEvent("reading", { message: {"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]} }) must inherit property "serialNumber" with the proper type]
+    expected: FAIL
+
+  [NFCReadingEvent interface: new NFCReadingEvent("reading", { message: {"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]} }) must inherit property "message" with the proper type]
+    expected: FAIL
+
+  [NDEFMessage interface: new NDEFMessage([{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]); must inherit property "url" with the proper type]
+    expected: FAIL
+
+  [NFCReadingEvent must be primary interface of new NFCReadingEvent("reading", { message: {"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]} })]
+    expected: FAIL
+
+  [NDEFRecord interface: new NDEFRecord({"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}); must inherit property "toText()" with the proper type]
+    expected: FAIL
+
+  [NDEFMessage must be primary interface of new NDEFMessage([{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]);]
+    expected: FAIL
+
+  [NDEFRecord interface: new NDEFRecord({"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}); must inherit property "mediaType" with the proper type]
+    expected: FAIL
+
+  [Stringification of new NDEFMessage([{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]);]
+    expected: FAIL
+
+  [NDEFMessage interface: new NDEFMessage([{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]); must inherit property "records" with the proper type]
+    expected: FAIL
+
+  [NDEFRecord interface: toJSON operation on new NDEFRecord({"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"});]
+    expected: FAIL
+
+  [NDEFRecord interface: new NDEFRecord({"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}); must inherit property "toJSON()" with the proper type]
+    expected: FAIL
+
+  [Stringification of new NDEFRecord({"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"});]
+    expected: FAIL
+
+  [NDEFRecord interface: new NDEFRecord({"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}); must inherit property "toArrayBuffer()" with the proper type]
+    expected: FAIL
+
+  [Stringification of new NFCReadingEvent("reading", { message: {"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]} })]
+    expected: FAIL
+
+  [NDEFRecord interface: new NDEFRecord({"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}); must inherit property "recordType" with the proper type]
+    expected: FAIL
+
+  [Stringification of new NDEFMessage([{"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]}\]);]
+    expected: FAIL
+
+  [NDEFMessage interface: new NDEFMessage([{"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]}\]); must inherit property "url" with the proper type]
+    expected: FAIL
+
+  [NDEFMessage interface: new NDEFMessage([{"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]}\]); must inherit property "records" with the proper type]
+    expected: FAIL
+
+  [NDEFMessage must be primary interface of new NDEFMessage([{"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]}\]);]
+    expected: FAIL
+
+  [Stringification of new NDEFMessage({"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]});]
+    expected: FAIL
+
+  [NDEFMessage must be primary interface of new NDEFMessage({"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]});]
+    expected: FAIL
+
+  [NDEFMessage interface: new NDEFMessage({"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]}); must inherit property "url" with the proper type]
+    expected: FAIL
+
+  [NDEFMessage interface: new NDEFMessage({"url":"/custom/path","records":[{"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}\]}); must inherit property "records" with the proper type]
+    expected: FAIL
+
   [NDEFRecord interface: attribute id]
     expected: FAIL
 
   [NDEFRecord interface: operation toRecords()]
     expected: FAIL
 
+  [NDEFRecord interface: new NDEFRecord({"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}); must inherit property "id" with the proper type]
+    expected: FAIL
+
+  [NDEFRecord interface: new NDEFRecord({"recordType":"text","mediaType":"text/plain","data":"Hello World","id":"/custom/path"}); must inherit property "toRecords()" with the proper type]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-nfc/NDEFRecord_constructor.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-nfc/NDEFRecord_constructor.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-nfc/NDEFRecord_constructor.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-nfc/NDEFRecord_constructor.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -11,3 +11,12 @@
   [NDEFRecord constructor with null init dict]
     expected: FAIL
 
+  [NDEFRecord constructor with text record type]
+    expected: FAIL
+
+  [NDEFRecord constructor with url record type]
+    expected: FAIL
+
+  [NDEFRecord constructor with record type string being treated as case sensitive]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-share/canShare-files.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-share/canShare-files.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-share/canShare-files.https.html.ini	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-share/canShare-files.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-[canShare-files.https.html]
-  [canShare with repeated file]
-    expected: FAIL
-
-  [canShare with single file list]
-    expected: FAIL
-
-  [canShare with file list and url]
-    expected: FAIL
-
-  [canShare with file list]
-    expected: FAIL
-
-  [canShare with empty file list]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-share/canShare-files.tentative.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-share/canShare-files.tentative.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-share/canShare-files.tentative.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-share/canShare-files.tentative.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,16 @@
+[canShare-files.tentative.https.html]
+  [canShare with repeated file]
+    expected: FAIL
+
+  [canShare with single file list]
+    expected: FAIL
+
+  [canShare with file list and url]
+    expected: FAIL
+
+  [canShare with file list]
+    expected: FAIL
+
+  [canShare with empty file list]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-share/canShare.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-share/canShare.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-share/canShare.https.html.ini	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-share/canShare.https.html.ini	1970-01-01 00:00:00.000000000 +0000
@@ -1,52 +0,0 @@
-[canShare.https.html]
-  [canShare with unexpected field]
-    expected: FAIL
-
-  [canShare with URL having no scheme]
-    expected: FAIL
-
-  [canShare with an invalid URL]
-    expected: FAIL
-
-  [canShare with number]
-    expected: FAIL
-
-  [canShare with attribute undefined is equivalent to omitting the attribute]
-    expected: FAIL
-
-  [canShare with a dictionary containing only surplus fields]
-    expected: FAIL
-
-  [canShare with a null argument (same as empty dictionary)]
-    expected: FAIL
-
-  [canShare with data URL]
-    expected: FAIL
-
-  [canShare with title]
-    expected: FAIL
-
-  [canShare with a undefined argument (same as empty dictionary)]
-    expected: FAIL
-
-  [canShare with object]
-    expected: FAIL
-
-  [canShare with null attribute]
-    expected: FAIL
-
-  [canShare with an empty dictionary]
-    expected: FAIL
-
-  [canShare with no arguments (same as empty dictionary)]
-    expected: FAIL
-
-  [canShare with text]
-    expected: FAIL
-
-  [canShare with empty URL]
-    expected: FAIL
-
-  [canShare with URL]
-    expected: FAIL
-
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-share/canShare.tentative.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-share/canShare.tentative.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-share/canShare.tentative.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-share/canShare.tentative.https.html.ini	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,52 @@
+[canShare.tentative.https.html]
+  [canShare with unexpected field]
+    expected: FAIL
+
+  [canShare with URL having no scheme]
+    expected: FAIL
+
+  [canShare with an invalid URL]
+    expected: FAIL
+
+  [canShare with number]
+    expected: FAIL
+
+  [canShare with attribute undefined is equivalent to omitting the attribute]
+    expected: FAIL
+
+  [canShare with a dictionary containing only surplus fields]
+    expected: FAIL
+
+  [canShare with a null argument (same as empty dictionary)]
+    expected: FAIL
+
+  [canShare with data URL]
+    expected: FAIL
+
+  [canShare with title]
+    expected: FAIL
+
+  [canShare with a undefined argument (same as empty dictionary)]
+    expected: FAIL
+
+  [canShare with object]
+    expected: FAIL
+
+  [canShare with null attribute]
+    expected: FAIL
+
+  [canShare with an empty dictionary]
+    expected: FAIL
+
+  [canShare with no arguments (same as empty dictionary)]
+    expected: FAIL
+
+  [canShare with text]
+    expected: FAIL
+
+  [canShare with empty URL]
+    expected: FAIL
+
+  [canShare with URL]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-share/share-sharePromise-internal-slot.https.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-share/share-sharePromise-internal-slot.https.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/web-share/share-sharePromise-internal-slot.https.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/web-share/share-sharePromise-internal-slot.https.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,4 @@
+[share-sharePromise-internal-slot.https.html]
+  [Only allow one share call at a time, which is controlled by the [[sharePromise\]\] internal slot.]
+    expected: FAIL
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/webvtt/api/VTTRegion/regionAnchorX.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/webvtt/api/VTTRegion/regionAnchorX.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/meta/webvtt/api/VTTRegion/regionAnchorX.html.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/meta/webvtt/api/VTTRegion/regionAnchorX.html.ini	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,3 @@
+[regionAnchorX.html]
+  expected:
+    if (os == "linux") and not debug and not webrender and (processor == "x86_64"): ["OK", "CRASH"]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/.azure-pipelines.yml firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/.azure-pipelines.yml
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/.azure-pipelines.yml	2019-09-13 05:13:27.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/.azure-pipelines.yml	2019-09-15 11:33:23.000000000 +0000
@@ -328,7 +328,7 @@
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   # --exclude is a workaround for https://github.com/web-platform-tests/wpt/issues/16229
-  - script: no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info safari --exclude /inert/inert-retargeting.tentative.html --exclude /inert/inert-retargeting-iframe.tentative.html
+  - script: no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info safari --exclude /inert/inert-retargeting.tentative.html --exclude /inert/inert-retargeting-iframe.tentative.html --exclude /web-share/share-sharePromise-internal-slot.https.html
     displayName: 'Run tests'
   - task: PublishBuildArtifacts@1
     displayName: 'Publish results'
@@ -361,7 +361,7 @@
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   # --exclude is a workaround for https://github.com/web-platform-tests/wpt/issues/16229
-  - script: no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info --channel preview safari --exclude /inert/inert-retargeting.tentative.html --exclude /inert/inert-retargeting-iframe.tentative.html --exclude /payment-request/
+  - script: no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info --channel preview safari --exclude /inert/inert-retargeting.tentative.html --exclude /inert/inert-retargeting-iframe.tentative.html --exclude /payment-request/ --exclude /web-share/share-sharePromise-internal-slot.https.html
     displayName: 'Run tests'
   - task: PublishBuildArtifacts@1
     displayName: 'Publish results'
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/client-hints/accept-ch-cache-revalidation.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/client-hints/accept-ch-cache-revalidation.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/client-hints/accept-ch-cache-revalidation.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/client-hints/accept-ch-cache-revalidation.https.html	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Tests Stale While Revalidate is not executed for fetch API</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script>
+function wait25ms(test) {
+  return new Promise(resolve => {
+    test.step_timeout(() => {
+      resolve();
+    }, 25);
+  });
+}
+
+promise_test(async (test) => {
+  var request_token = token();
+  var client_hint_headers = [
+    "device-memory",
+    "dpr",
+    "width",
+    "viewport-width",
+    "rtt",
+    "downlink",
+    "ect",
+    "sec-ch-lang",
+    "sec-ch-ua",
+    "sec-ch-ua-arch",
+    "sec-ch-ua-platform",
+    "sec-ch-ua-model",
+  ];
+
+  const response = await fetch(`resources/stale-echo-client-hints.py?token=` + request_token);
+  const response2 = await fetch(`resources/stale-echo-client-hints.py?token=` + request_token);
+
+  assert_equals(response.headers.get('Unique-Id'), response2.headers.get('Unique-Id'));
+
+  while(true) {
+    const revalidation_check = await fetch(`resources/stale-echo-client-hints.py?query&token=` + request_token);
+    if (revalidation_check.headers.get('Count') == '2') {
+      client_hint_headers.forEach(header => {
+        assert_equals(revalidation_check.headers.get(header+"-recieved"), revalidation_check.headers.get(header+"-previous"));
+      });
+      break;
+    }
+    await wait25ms(test);
+  }
+}, 'Same headers sent for revalidation request');
+</script>
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/client-hints/accept-ch-cache-revalidation.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/client-hints/accept-ch-cache-revalidation.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/client-hints/accept-ch-cache-revalidation.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/client-hints/accept-ch-cache-revalidation.https.html.headers	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1 @@
+Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/client-hints/resources/stale-echo-client-hints.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/client-hints/resources/stale-echo-client-hints.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/client-hints/resources/stale-echo-client-hints.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/client-hints/resources/stale-echo-client-hints.py	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,60 @@
+import random
+import string
+
+def id_token():
+   letters = string.ascii_lowercase
+   return ''.join(random.choice(letters) for i in range(20))
+
+def main(request, response):
+    client_hint_headers = [
+      "device-memory",
+      "dpr",
+      "width",
+      "viewport-width",
+      "rtt",
+      "downlink",
+      "ect",
+      "sec-ch-lang",
+      "sec-ch-ua",
+      "sec-ch-ua-arch",
+      "sec-ch-ua-platform",
+      "sec-ch-ua-model",
+    ]
+
+    client_hints_curr = {i:request.headers.get(i) for i in client_hint_headers}
+
+    token = request.GET.first("token", None)
+    is_query = request.GET.first("query", None) is not None
+    with request.server.stash.lock:
+      stash = request.server.stash.take(token)
+      if stash != None:
+        (value, client_hints_prev) = stash
+        count = int(value)
+      else:
+        count = 0
+        client_hints_prev = {}
+
+      if is_query:
+        if count < 2:
+          request.server.stash.put(token, (count, client_hints_curr))
+      else:
+        count = count + 1
+        request.server.stash.put(token, (count, client_hints_curr))
+
+    for header in client_hint_headers:
+      if client_hints_curr[header] is not None:
+        response.headers.set(header+"-recieved", client_hints_curr[header])
+      if (header in client_hints_prev) and (client_hints_prev[header] is not None):
+        response.headers.set(header+"-previous", client_hints_prev[header])
+
+    if is_query:
+      headers = [("Count", count)]
+      content = ""
+      return 200, headers, content
+    else:
+      unique_id = id_token()
+      headers = [("Content-Type", "text/html"),
+                 ("Cache-Control", "private, max-age=0, stale-while-revalidate=60"),
+                 ("Unique-Id", unique_id)]
+      content = "report('{}')".format(unique_id)
+      return 200, headers, content
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/resources/common.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/resources/common.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/resources/common.js	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/resources/common.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,1185 +0,0 @@
-/**
- * @fileoverview Utilities for mixed-content in Web Platform Tests.
- * @author burnik@google.com (Kristijan Burnik)
- * Disclaimer: Some methods of other authors are annotated in the corresponding
- *     method's JSDoc.
- */
-
-// ===============================================================
-// Types
-// ===============================================================
-// Objects of the following types are used to represent what kind of
-// subresource requests should be sent with what kind of policies,
-// from what kind of possibly nested source contexts.
-// The objects are represented as JSON objects (not JavaScript/Python classes
-// in a strict sense) to be passed between JavaScript/Python code.
-
-// Note: So far this document covers:
-// - resources/common.js : client-side test infra code
-// - scope/ - server-side scripts that serves nested source contexts
-// but doesn't cover:
-// - tools/ - generator scripts that generates top-level HTML documents.
-// There are some policies only handled by generators (e.g. mixed-content
-// opt-ins) and not yet covered by the docs here.
-
-/**
-  @typedef PolicyDelivery
-  @type {object}
-  Referrer policy etc. can be applied/delivered in several ways.
-  A PolicyDelivery object specifies what policy is delivered and how.
-
-  @property {string} deliveryType
-    Specifies how the policy is delivered.
-    The valid deliveryType are:
-
-     "attr"
-        [A] DOM attributes e.g. referrerPolicy.
-
-      "rel-noref"
-        [A] <link rel="noreferrer"> (referrer-policy only).
-
-      "http-rp"
-        [B] HTTP response headers.
-
-      "meta"
-        [B] <meta> elements.
-
-  @property {string} key
-  @property {string} value
-    Specifies what policy to be delivered. The valid keys are:
-
-      "referrerPolicy"
-        Referrer Policy
-        https://w3c.github.io/webappsec-referrer-policy/
-        Valid values are those listed in
-        https://w3c.github.io/webappsec-referrer-policy/#referrer-policy
-        (except that "" is represented as null/None)
-
-  A PolicyDelivery can be specified in several ways:
-
-  - (for [A]) Associated with an individual subresource request and
-    specified in `Subresource.policies`,
-    e.g. referrerPolicy attributes of DOM elements.
-    This is handled in invokeRequest().
-
-  - (for [B]) Associated with an nested environmental settings object and
-    specified in `SourceContext.policies`,
-    e.g. HTTP referrer-policy response headers of HTML/worker scripts.
-    This is handled in server-side under /common/security-features/scope/.
-
-  - (for [B]) Associated with the top-level HTML document.
-    This is handled by the generators.d
-*/
-
-/**
-  @typedef Subresource
-  @type {object}
-  A Subresource represents how a subresource request is sent.
-
-  @property{SubresourceType} subresourceType
-    How the subresource request is sent,
-    e.g. "img-tag" for sending a request via <img src>.
-    See the keys of `subresourceMap` for valid values.
-
-  @property{string} url
-    subresource's URL.
-    Typically this is constructed by getRequestURLs() below.
-
-  @property{PolicyDelivery} policyDeliveries
-    Policies delivered specific to the subresource request.
-*/
-
-/**
-  @typedef SourceContext
-  @type {object}
-  Requests can be possibly sent from various kinds of source contexts, i.e.
-  fetch client's environment settings objects:
-  top-level windows, iframes, or workers.
-  A SourceContext object specifies one environment settings object, and
-  an Array<SourceContext> specifies a possibly nested context,
-  from the outer-most to inner-most environment settings objects.
-
-  For example:
-    [{sourceContextType: "srcdoc"}, {sourceContextType: "worker-classic"}]
-  means that a subresource request is to be sent from
-  a classic dedicated worker created from <iframe srcdoc>
-  inside the top-level HTML document.
-  Note: the top-level document is not included in the array and
-  is assumed implicitly.
-
-  SourceContext (or Array<SourceContext>) is set based on
-  the fetch client's settings object that is used for the subresource request,
-  NOT on module map settings object, and
-  NOT on the inner-most settings object that appears in the test.
-  For example, Array<SourceContext> is `[]` (indicating the top Window)
-  for `worker.js`
-  - When it is the root worker script: `new Worker('worker.js')`, or
-  - When it is imported from the root worker script:
-    `new Worker('top.js', {type: 'module'})`
-    where `top.js` has `import 'worker.js'`.
-  because the request for `worker.js` uses the Window as its fetch client's
-  settings object, while a WorkerGlobalScope is created though.
-
-  @property {string} sourceContextType
-    Kind of the source context to be used.
-    Valid values are the keys of `sourceContextMap` below.
-
-  @property {Array<PolicyDelivery>} policyDeliveries
-    A list of PolicyDelivery applied to the source context.
-*/
-
-// ===============================================================
-// General utility functions
-// ===============================================================
-
-function timeoutPromise(t, ms) {
-  return new Promise(resolve => { t.step_timeout(resolve, ms); });
-}
-
-/**
- * Normalizes the target port for use in a URL. For default ports, this is the
- *     empty string (omitted port), otherwise it's a colon followed by the port
- *     number. Ports 80, 443 and an empty string are regarded as default ports.
- * @param {number} targetPort The port to use
- * @return {string} The port portion for using as part of a URL.
- */
-function getNormalizedPort(targetPort) {
-  return ([80, 443, ""].indexOf(targetPort) >= 0) ? "" : ":" + targetPort;
-}
-
-/**
- * Creates a GUID.
- *     See: https://en.wikipedia.org/wiki/Globally_unique_identifier
- *     Original author: broofa (http://www.broofa.com/)
- *     Sourced from: http://stackoverflow.com/a/2117523/4949715
- * @return {string} A pseudo-random GUID.
- */
-function guid() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
-    var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-    return v.toString(16);
-  });
-}
-
-/**
- * Initiates a new XHR via GET.
- * @param {string} url The endpoint URL for the XHR.
- * @param {string} responseType Optional - how should the response be parsed.
- *     Default is "json".
- *     See: https://xhr.spec.whatwg.org/#dom-xmlhttprequest-responsetype
- * @return {Promise} A promise wrapping the success and error events.
- */
-function xhrRequest(url, responseType) {
-  return new Promise(function(resolve, reject) {
-    var xhr = new XMLHttpRequest();
-    xhr.open('GET', url, true);
-    xhr.responseType = responseType || "json";
-
-    xhr.addEventListener("error", function() {
-      reject(Error("Network Error"));
-    });
-
-    xhr.addEventListener("load", function() {
-      if (xhr.status != 200)
-        reject(Error(xhr.statusText));
-      else
-        resolve(xhr.response);
-    });
-
-    xhr.send();
-  });
-}
-
-/**
- * Sets attributes on a given DOM element.
- * @param {DOMElement} element The element on which to set the attributes.
- * @param {object} An object with keys (serving as attribute names) and values.
- */
-function setAttributes(el, attrs) {
-  attrs = attrs || {}
-  for (var attr in attrs) {
-    if (attr !== 'src')
-      el.setAttribute(attr, attrs[attr]);
-  }
-  // Workaround for Chromium: set <img>'s src attribute after all other
-  // attributes to ensure the policy is applied.
-  for (var attr in attrs) {
-    if (attr === 'src')
-      el.setAttribute(attr, attrs[attr]);
-  }
-}
-
-/**
- * Binds to success and error events of an object wrapping them into a promise
- *     available through {@code element.eventPromise}. The success event
- *     resolves and error event rejects.
- * This method adds event listeners, and then removes all the added listeners
- * when one of listened event is fired.
- * @param {object} element An object supporting events on which to bind the
- *     promise.
- * @param {string} resolveEventName [="load"] The event name to bind resolve to.
- * @param {string} rejectEventName [="error"] The event name to bind reject to.
- */
-function bindEvents(element, resolveEventName, rejectEventName) {
-  element.eventPromise =
-      bindEvents2(element, resolveEventName, element, rejectEventName);
-}
-
-// Returns a promise wrapping success and error events of objects.
-// This is a variant of bindEvents that can accept separate objects for each
-// events and two events to reject, and doesn't set `eventPromise`.
-//
-// When `resolveObject`'s `resolveEventName` event (default: "load") is
-// fired, the promise is resolved with the event.
-//
-// When `rejectObject`'s `rejectEventName` event (default: "error") or
-// `rejectObject2`'s `rejectEventName2` event (default: "error") is
-// fired, the promise is rejected.
-//
-// `rejectObject2` is optional.
-function bindEvents2(resolveObject, resolveEventName, rejectObject, rejectEventName, rejectObject2, rejectEventName2) {
-  return new Promise(function(resolve, reject) {
-    const actualResolveEventName = resolveEventName || "load";
-    const actualRejectEventName = rejectEventName || "error";
-    const actualRejectEventName2 = rejectEventName2 || "error";
-
-    const resolveHandler = function(event) {
-      cleanup();
-      resolve(event);
-    };
-
-    const rejectHandler = function(event) {
-      // Chromium starts propagating errors from worker.onerror to
-      // window.onerror. This handles the uncaught exceptions in tests.
-      event.preventDefault();
-      cleanup();
-      reject(event);
-    };
-
-    const cleanup = function() {
-      resolveObject.removeEventListener(actualResolveEventName, resolveHandler);
-      rejectObject.removeEventListener(actualRejectEventName, rejectHandler);
-      if (rejectObject2) {
-        rejectObject2.removeEventListener(actualRejectEventName2, rejectHandler);
-      }
-    };
-
-    resolveObject.addEventListener(actualResolveEventName, resolveHandler);
-    rejectObject.addEventListener(actualRejectEventName, rejectHandler);
-    if (rejectObject2) {
-      rejectObject2.addEventListener(actualRejectEventName2, rejectHandler);
-    }
-  });
-}
-
-/**
- * Creates a new DOM element.
- * @param {string} tagName The type of the DOM element.
- * @param {object} attrs A JSON with attributes to apply to the element.
- * @param {DOMElement} parent Optional - an existing DOM element to append to
- *     If not provided, the returned element will remain orphaned.
- * @param {boolean} doBindEvents Optional - Whether to bind to load and error
- *     events and provide the promise wrapping the events via the element's
- *     {@code eventPromise} property. Default value evaluates to false.
- * @return {DOMElement} The newly created DOM element.
- */
-function createElement(tagName, attrs, parentNode, doBindEvents) {
-  var element = document.createElement(tagName);
-
-  if (doBindEvents)
-    bindEvents(element);
-
-  // We set the attributes after binding to events to catch any
-  // event-triggering attribute changes. E.g. form submission.
-  //
-  // But be careful with images: unlike other elements they will start the load
-  // as soon as the attr is set, even if not in the document yet, and sometimes
-  // complete it synchronously, so the append doesn't have the effect we want.
-  // So for images, we want to set the attrs after appending, whereas for other
-  // elements we want to do it before appending.
-  var isImg = (tagName == "img");
-  if (!isImg)
-    setAttributes(element, attrs);
-
-  if (parentNode)
-    parentNode.appendChild(element);
-
-  if (isImg)
-    setAttributes(element, attrs);
-
-  return element;
-}
-
-function createRequestViaElement(tagName, attrs, parentNode) {
-  return createElement(tagName, attrs, parentNode, true).eventPromise;
-}
-
-/**
- * Creates a new empty iframe and appends it to {@code document.body} .
- * @param {string} name The name and ID of the new iframe.
- * @param {boolean} doBindEvents Whether to bind load and error events.
- * @return {DOMElement} The newly created iframe.
- */
-function createHelperIframe(name, doBindEvents) {
-  return createElement("iframe",
-                       {"name": name, "id": name},
-                       document.body,
-                       doBindEvents);
-}
-
-function wrapResult(server_data) {
-  if (typeof(server_data) === "string") {
-    throw server_data;
-  }
-  return {
-    referrer: server_data.headers.referer,
-    headers: server_data.headers
-  }
-}
-
-// ===============================================================
-// Subresources
-// ===============================================================
-
-/**
-  @typedef RequestResult
-  @type {object}
-  Represents the result of sending an request.
-  All properties are optional. See the comments for
-  requestVia*() and invokeRequest() below to see which properties are set.
-
-  @property {Array<Object<string, string>>} headers
-    HTTP request headers sent to server.
-  @property {string} referrer - Referrer.
-  @property {string} location - The URL of the subresource.
-  @property {string} sourceContextUrl
-    the URL of the global object where the actual request is sent.
-*/
-
-/**
-  requestVia*(url, additionalAttributes) functions send a subresource
-  request from the current environment settings object.
-
-  @param {string} url
-    The URL of the subresource.
-  @param {Object<string, string>} additionalAttributes
-    Additional attributes set to DOM elements
-    (element-initiated requests only).
-
-  @returns {Promise} that are resolved with a RequestResult object
-  on successful requests.
-
-  - Category 1:
-      `headers`: set.
-      `referrer`: set via `document.referrer`.
-      `location`: set via `document.location`.
-      See `template/document.html.template`.
-  - Category 2:
-      `headers`: set.
-      `referrer`: set to `headers.referer` by `wrapResult()`.
-      `location`: not set.
-  - Category 3:
-      All the keys listed above are NOT set.
-  `sourceContextUrl` is not set here.
-
-  -------------------------------- -------- --------------------------
-  Function name                    Category Used in
-                                            -------- ------- ---------
-                                            referrer mixed-  upgrade-
-                                            policy   content insecure-
-                                            policy   content request
-  -------------------------------- -------- -------- ------- ---------
-  requestViaAnchor                 1        Y        Y       -
-  requestViaArea                   1        Y        Y       -
-  requestViaAudio                  3        -        Y       -
-  requestViaDedicatedWorker        2        Y        Y       Y
-  requestViaFetch                  2        Y        Y       -
-  requestViaForm                   3        -        Y       -
-  requestViaIframe                 1        Y        Y       -
-  requestViaImage                  2        Y        Y       -
-  requestViaLinkPrefetch           3        -        Y       -
-  requestViaLinkStylesheet         3        -        Y       -
-  requestViaObject                 3        -        Y       -
-  requestViaPicture                3        -        Y       -
-  requestViaScript                 2        Y        Y       -
-  requestViaSendBeacon             3        -        Y       -
-  requestViaSharedWorker           2        Y        -       -
-  requestViaVideo                  3        -        Y       -
-  requestViaWebSocket              3        -        Y       -
-  requestViaWorklet                3        -        Y       Y
-  requestViaXhr                    2        Y        Y       -
-  -------------------------------- -------- -------- ------- ---------
-*/
-
-/**
- * Creates a new iframe, binds load and error events, sets the src attribute and
- *     appends it to {@code document.body} .
- * @param {string} url The src for the iframe.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaIframe(url, additionalAttributes) {
-  const iframe = createElement(
-      "iframe",
-      Object.assign({"src": url}, additionalAttributes),
-      document.body,
-      false);
-  return bindEvents2(window, "message", iframe, "error", window, "error")
-      .then(event => {
-          if (event.source !== iframe.contentWindow)
-            return Promise.reject(new Error('Unexpected event.source'));
-          return event.data;
-        });
-}
-
-/**
- * Creates a new image, binds load and error events, sets the src attribute and
- *     appends it to {@code document.body} .
- * @param {string} url The src for the image.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaImage(url, additionalAttributes) {
-  const img = createElement(
-      "img",
-      // crossOrigin attribute is added to read the pixel data of the response.
-      Object.assign({"src": url, "crossOrigin": "Anonymous"}, additionalAttributes),
-      document.body, true);
-  return img.eventPromise.then(() => wrapResult(decodeImageData(img)));
-}
-
-// Helper for requestViaImage().
-function decodeImageData(img) {
-  var canvas = document.createElement("canvas");
-  var context = canvas.getContext('2d');
-  context.drawImage(img, 0, 0);
-  var imgData = context.getImageData(0, 0, img.clientWidth, img.clientHeight);
-  const rgba = imgData.data;
-
-  let decodedBytes = new Uint8ClampedArray(rgba.length);
-  let decodedLength = 0;
-
-  for (var i = 0; i + 12 <= rgba.length; i += 12) {
-    // A single byte is encoded in three pixels. 8 pixel octets (among
-    // 9 octets = 3 pixels * 3 channels) are used to encode 8 bits,
-    // the most significant bit first, where `0` and `255` in pixel values
-    // represent `0` and `1` in bits, respectively.
-    // This encoding is used to avoid errors due to different color spaces.
-    const bits = [];
-    for (let j = 0; j < 3; ++j) {
-      bits.push(rgba[i + j * 4 + 0]);
-      bits.push(rgba[i + j * 4 + 1]);
-      bits.push(rgba[i + j * 4 + 2]);
-      // rgba[i + j * 4 + 3]: Skip alpha channel.
-    }
-    // The last one element is not used.
-    bits.pop();
-
-    // Decode a single byte.
-    let byte = 0;
-    for (let j = 0; j < 8; ++j) {
-      byte <<= 1;
-      if (bits[j] >= 128)
-        byte |= 1;
-    }
-
-    // Zero is the string terminator.
-    if (byte == 0)
-      break;
-
-    decodedBytes[decodedLength++] = byte;
-  }
-
-  // Remove trailing nulls from data.
-  decodedBytes = decodedBytes.subarray(0, decodedLength);
-  var string_data = (new TextDecoder("ascii")).decode(decodedBytes);
-
-  return JSON.parse(string_data);
-}
-
-/**
- * Initiates a new XHR GET request to provided URL.
- * @param {string} url The endpoint URL for the XHR.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaXhr(url) {
-  return xhrRequest(url).then(result => wrapResult(result));
-}
-
-/**
- * Initiates a new GET request to provided URL via the Fetch API.
- * @param {string} url The endpoint URL for the Fetch.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaFetch(url) {
-  return fetch(url)
-    .then(res => res.json())
-    .then(j => wrapResult(j));
-}
-
-function dedicatedWorkerUrlThatFetches(url) {
-  return `data:text/javascript,
-    fetch('${url}')
-      .then(r => r.json())
-      .then(j => postMessage(j))
-      .catch((e) => postMessage(e.message));`;
-}
-
-function workerUrlThatImports(url) {
-  return `data:text/javascript,import '${url}';`;
-}
-
-/**
- * Creates a new Worker, binds message and error events wrapping them into.
- *     {@code worker.eventPromise} and posts an empty string message to start
- *     the worker.
- * @param {string} url The endpoint URL for the worker script.
- * @param {object} options The options for Worker constructor.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaDedicatedWorker(url, options) {
-  var worker;
-  try {
-    worker = new Worker(url, options);
-  } catch (e) {
-    return Promise.reject(e);
-  }
-  worker.postMessage('');
-  return bindEvents2(worker, "message", worker, "error")
-    .then(event => wrapResult(event.data));
-}
-
-function requestViaSharedWorker(url) {
-  var worker;
-  try {
-    worker = new SharedWorker(url);
-  } catch(e) {
-    return Promise.reject(e);
-  }
-  const promise = bindEvents2(worker.port, "message", worker, "error")
-    .then(event => wrapResult(event.data));
-  worker.port.start();
-  return promise;
-}
-
-// Returns a reference to a worklet object corresponding to a given type.
-function get_worklet(type) {
-  if (type == 'animation')
-    return CSS.animationWorklet;
-  if (type == 'layout')
-    return CSS.layoutWorklet;
-  if (type == 'paint')
-    return CSS.paintWorklet;
-  if (type == 'audio')
-    return new OfflineAudioContext(2,44100*40,44100).audioWorklet;
-
-  throw new Error('unknown worklet type is passed.');
-}
-
-function requestViaWorklet(type, url) {
-  try {
-    return get_worklet(type).addModule(url);
-  } catch (e) {
-    return Promise.reject(e);
-  }
-}
-
-/**
- * Sets the href attribute on a navigable DOM element and performs a navigation
- *     by clicking it. To avoid navigating away from the current execution
- *     context, a target attribute is set to point to a new helper iframe.
- * @param {DOMElement} navigableElement The navigable DOMElement
- * @param {string} url The href for the navigable element.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaNavigable(navigableElement, url) {
-  var iframe = createHelperIframe(guid(), false);
-  setAttributes(navigableElement,
-                {"href": url,
-                 "target": iframe.name});
-
-  const promise =
-    bindEvents2(window, "message", iframe, "error", window, "error")
-      .then(event => {
-          if (event.source !== iframe.contentWindow)
-            return Promise.reject(new Error('Unexpected event.source'));
-          return event.data;
-        });
-  navigableElement.click();
-  return promise;
-}
-
-/**
- * Creates a new anchor element, appends it to {@code document.body} and
- *     performs the navigation.
- * @param {string} url The URL to navigate to.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaAnchor(url, additionalAttributes) {
-  var a = createElement(
-      "a",
-      Object.assign({"innerHTML": "Link to resource"}, additionalAttributes),
-      document.body);
-
-  return requestViaNavigable(a, url);
-}
-
-/**
- * Creates a new area element, appends it to {@code document.body} and performs
- *     the navigation.
- * @param {string} url The URL to navigate to.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaArea(url, additionalAttributes) {
-  var area = createElement(
-      "area",
-      Object.assign({}, additionalAttributes),
-      document.body);
-
-  // TODO(kristijanburnik): Append to map and add image.
-  return requestViaNavigable(area, url);
-}
-
-/**
- * Creates a new script element, sets the src to url, and appends it to
- *     {@code document.body}.
- * @param {string} url The src URL.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaScript(url, additionalAttributes) {
-  const script = createElement(
-      "script",
-      Object.assign({"src": url}, additionalAttributes),
-      document.body,
-      false);
-
-  return bindEvents2(window, "message", script, "error", window, "error")
-    .then(event => wrapResult(event.data));
-}
-
-/**
- * Creates a new form element, sets attributes, appends it to
- *     {@code document.body} and submits the form.
- * @param {string} url The URL to submit to.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaForm(url) {
-  var iframe = createHelperIframe(guid());
-  var form = createElement("form",
-                           {"action": url,
-                            "method": "POST",
-                            "target": iframe.name},
-                           document.body);
-  bindEvents(iframe);
-  form.submit();
-
-  return iframe.eventPromise;
-}
-
-/**
- * Creates a new link element for a stylesheet, binds load and error events,
- *     sets the href to url and appends it to {@code document.head}.
- * @param {string} url The URL for a stylesheet.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaLinkStylesheet(url) {
-  return createRequestViaElement("link",
-                                 {"rel": "stylesheet", "href": url},
-                                 document.head);
-}
-
-/**
- * Creates a new link element for a prefetch, binds load and error events, sets
- *     the href to url and appends it to {@code document.head}.
- * @param {string} url The URL of a resource to prefetch.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaLinkPrefetch(url) {
-  var link = document.createElement('link');
-  if (link.relList && link.relList.supports && link.relList.supports("prefetch")) {
-    return createRequestViaElement("link",
-                                   {"rel": "prefetch", "href": url},
-                                   document.head);
-  } else {
-    return Promise.reject("This browser does not support 'prefetch'.");
-  }
-}
-
-/**
- * Initiates a new beacon request.
- * @param {string} url The URL of a resource to prefetch.
- * @return {Promise} The promise for success/error events.
- */
-async function requestViaSendBeacon(url) {
-  function wait(ms) {
-    return new Promise(resolve => step_timeout(resolve, ms));
-  }
-  if (!navigator.sendBeacon(url)) {
-    // If mixed-content check fails, it should return false.
-    throw new Error('sendBeacon() fails.');
-  }
-  // We don't have a means to see the result of sendBeacon() request
-  // for sure. Let's wait for a while and let the generic test function
-  // ask the server for the result.
-  await wait(500);
-  return 'allowed';
-}
-
-/**
- * Creates a new media element with a child source element, binds loadeddata and
- *     error events, sets attributes and appends to document.body.
- * @param {string} type The type of the media element (audio/video/picture).
- * @param {object} media_attrs The attributes for the media element.
- * @param {object} source_attrs The attributes for the child source element.
- * @return {DOMElement} The newly created media element.
- */
-function createMediaElement(type, media_attrs, source_attrs) {
-  var mediaElement = createElement(type, {});
-
-  var sourceElement = createElement("source", {});
-
-  mediaElement.eventPromise = new Promise(function(resolve, reject) {
-    mediaElement.addEventListener("loadeddata", function (e) {
-      resolve(e);
-    });
-
-    // Safari doesn't fire an `error` event when blocking mixed content.
-    mediaElement.addEventListener("stalled", function(e) {
-      reject(e);
-    });
-
-    sourceElement.addEventListener("error", function(e) {
-      reject(e);
-    });
-  });
-
-  setAttributes(mediaElement, media_attrs);
-  setAttributes(sourceElement, source_attrs);
-
-  mediaElement.appendChild(sourceElement);
-  document.body.appendChild(mediaElement);
-
-  return mediaElement;
-}
-
-/**
- * Creates a new video element, binds loadeddata and error events, sets
- *     attributes and source URL and appends to {@code document.body}.
- * @param {string} url The URL of the video.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaVideo(url) {
-  return createMediaElement("video",
-                            {},
-                            {"src": url}).eventPromise;
-}
-
-/**
- * Creates a new audio element, binds loadeddata and error events, sets
- *     attributes and source URL and appends to {@code document.body}.
- * @param {string} url The URL of the audio.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaAudio(url) {
-  return createMediaElement("audio",
-                            {},
-                            {"type": "audio/wav", "src": url}).eventPromise;
-}
-
-/**
- * Creates a new picture element, binds loadeddata and error events, sets
- *     attributes and source URL and appends to {@code document.body}. Also
- *     creates new image element appending it to the picture
- * @param {string} url The URL of the image for the source and image elements.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaPicture(url) {
-  var picture = createMediaElement("picture", {}, {"srcset": url,
-                                                "type": "image/png"});
-  return createRequestViaElement("img", {"src": url}, picture);
-}
-
-/**
- * Creates a new object element, binds load and error events, sets the data to
- *     url, and appends it to {@code document.body}.
- * @param {string} url The data URL.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaObject(url) {
-  return createRequestViaElement("object", {"data": url, "type": "text/html"}, document.body);
-}
-
-/**
- * Creates a new WebSocket pointing to {@code url} and sends a message string
- * "echo". The {@code message} and {@code error} events are triggering the
- * returned promise resolve/reject events.
- * @param {string} url The URL for WebSocket to connect to.
- * @return {Promise} The promise for success/error events.
- */
-function requestViaWebSocket(url) {
-  return new Promise(function(resolve, reject) {
-    var websocket = new WebSocket(url);
-
-    websocket.addEventListener("message", function(e) {
-      resolve(e.data);
-    });
-
-    websocket.addEventListener("open", function(e) {
-      websocket.send("echo");
-    });
-
-    websocket.addEventListener("error", function(e) {
-      reject(e)
-    });
-  })
-  .then(data => {
-      return JSON.parse(data);
-    });
-}
-
-/**
-  @typedef SubresourceType
-  @type {string}
-
-  Represents how a subresource is sent.
-  The keys of `subresourceMap` below are the valid values.
-*/
-
-// Subresource paths and invokers.
-const subresourceMap = {
-  "a-tag": {
-    path: "/common/security-features/subresource/document.py",
-    invoker: requestViaAnchor,
-  },
-  "area-tag": {
-    path: "/common/security-features/subresource/document.py",
-    invoker: requestViaArea,
-  },
-  "audio-tag": {
-    path: "/common/security-features/subresource/audio.py",
-    invoker: requestViaAudio,
-  },
-  "beacon-request": {
-    path: "/common/security-features/subresource/empty.py",
-    invoker: requestViaSendBeacon,
-  },
-  "fetch-request": {
-    path: "/common/security-features/subresource/xhr.py",
-    invoker: requestViaFetch,
-  },
-  "form-tag": {
-    path: "/common/security-features/subresource/empty.py",
-    invoker: requestViaForm,
-  },
-  "iframe-tag": {
-    path: "/common/security-features/subresource/document.py",
-    invoker: requestViaIframe,
-  },
-  "img-tag": {
-    path: "/common/security-features/subresource/image.py",
-    invoker: requestViaImage,
-  },
-  "link-css-tag": {
-    path: "/common/security-features/subresource/empty.py",
-    invoker: requestViaLinkStylesheet,
-  },
-  "link-prefetch-tag": {
-    path: "/common/security-features/subresource/empty.py",
-    invoker: requestViaLinkPrefetch,
-  },
-  "object-tag": {
-    path: "/common/security-features/subresource/empty.py",
-    invoker: requestViaObject,
-  },
-  "picture-tag": {
-    path: "/common/security-features/subresource/image.py",
-    invoker: requestViaPicture,
-  },
-  "script-tag": {
-    path: "/common/security-features/subresource/script.py",
-    invoker: requestViaScript,
-  },
-  "video-tag": {
-    path: "/common/security-features/subresource/video.py",
-    invoker: requestViaVideo,
-  },
-  "xhr-request": {
-    path: "/common/security-features/subresource/xhr.py",
-    invoker: requestViaXhr,
-  },
-
-  "worker-request": {
-    path: "/common/security-features/subresource/worker.py",
-    invoker: url => requestViaDedicatedWorker(url),
-  },
-  // TODO: Merge "module-worker" and "module-worker-top-level".
-  "module-worker": {
-    path: "/common/security-features/subresource/worker.py",
-    invoker: url => requestViaDedicatedWorker(url, {type: "module"}),
-  },
-  "module-worker-top-level": {
-    path: "/common/security-features/subresource/worker.py",
-    invoker: url => requestViaDedicatedWorker(url, {type: "module"}),
-  },
-  "module-data-worker-import": {
-    path: "/common/security-features/subresource/worker.py",
-    invoker: url =>
-        requestViaDedicatedWorker(workerUrlThatImports(url), {type: "module"}),
-  },
-  "shared-worker": {
-    path: "/common/security-features/subresource/shared-worker.py",
-    invoker: requestViaSharedWorker,
-  },
-
-  "websocket-request": {
-    path: "/stash_responder",
-    invoker: requestViaWebSocket,
-  },
-};
-for (const workletType of ['animation', 'audio', 'layout', 'paint']) {
-  subresourceMap[`worklet-${workletType}-top-level`] = {
-      path: "/common/security-features/subresource/worker.py",
-      invoker: url => requestViaWorklet(workletType, url)
-    };
-  subresourceMap[`worklet-${workletType}-data-import`] = {
-      path: "/common/security-features/subresource/worker.py",
-      invoker: url =>
-          requestViaWorklet(workletType, workerUrlThatImports(url))
-    };
-}
-
-/**
-  @typedef RedirectionType
-  @type {string}
-
-  Represents what redirects should occur to the subresource request
-  after initial request.
-  See preprocess_redirection() in
-  /common/security-features/subresource/subresource.py for valid values.
-*/
-
-/**
-  Construct subresource (and related) URLs.
-
-  @param {SubresourceType} subresourceType
-  @param {OriginType} originType
-  @param {RedirectionType} redirectionType
-  @returns {object} with following properties:
-    {string} testUrl
-      The subresource request URL.
-    {string} announceUrl
-    {string} assertUrl
-      The URLs to be used for detecting whether `testUrl` is actually sent
-      to the server.
-      1. Fetch `announceUrl` first,
-      2. then possibly fetch `testUrl`, and
-      3. finally fetch `assertUrl`.
-         The fetch result of `assertUrl` should indicate whether
-         `testUrl` is actually sent to the server or not.
-*/
-function getRequestURLs(subresourceType, originType, redirectionType) {
-  const key = guid();
-  const value = guid();
-
-  // We use the same stash path for both HTTP/S and WS/S stash requests.
-  const stashPath = encodeURIComponent("/mixed-content");
-
-  const stashEndpoint = "/common/security-features/subresource/xhr.py?key=" +
-                        key + "&path=" + stashPath;
-  return {
-    testUrl:
-      getSubresourceOrigin(originType) +
-        subresourceMap[subresourceType].path +
-        "?redirection=" + encodeURIComponent(redirectionType) +
-        "&action=purge&key=" + key +
-        "&path=" + stashPath,
-    announceUrl: stashEndpoint + "&action=put&value=" + value,
-    assertUrl: stashEndpoint + "&action=take",
-  };
-}
-
-// ===============================================================
-// Source Context
-// ===============================================================
-// Requests can be sent from several source contexts,
-// such as the main documents, iframes, workers, or so,
-// possibly nested, and possibly with <meta>/http headers added.
-// invokeRequest() and invokeFrom*() functions handles
-// SourceContext-related setup in client-side.
-
-/**
-  invokeRequest() invokes a subresource request
-  (specified as `subresource`)
-  from a (possibly nested) environment settings object
-  (specified as `sourceContextList`).
-
-  For nested contexts, invokeRequest() calls an invokeFrom*() function
-  that creates a nested environment settings object using
-  /common/security-features/scope/, which calls invokeRequest()
-  again inside the nested environment settings object.
-  This cycle continues until all specified
-  nested environment settings object are created, and
-  finally invokeRequest() calls a requestVia*() function to start the
-  subresource request from the inner-most environment settings object.
-
-  @param {Subresource} subresource
-  @param {Array<SourceContext>} sourceContextList
-
-  @returns {Promise} A promise that is resolved with an RequestResult object.
-  `sourceContextUrl` is always set. For whether other properties are set,
-  see the comments for requestVia*() above.
-*/
-function invokeRequest(subresource, sourceContextList) {
-  if (sourceContextList.length === 0) {
-    // No further nested global objects. Send the subresource request here.
-
-    const additionalAttributes = {};
-    /** @type {PolicyDelivery} policyDelivery */
-    for (const policyDelivery of (subresource.policyDeliveries || [])) {
-      // Depending on the delivery method, extend the subresource element with
-      // these attributes.
-      if (policyDelivery.deliveryType === "attr") {
-        additionalAttributes[policyDelivery.key] = policyDelivery.value;
-      } else if (policyDelivery.deliveryType === "rel-noref") {
-        additionalAttributes["rel"] = "noreferrer";
-      }
-    }
-
-    return subresourceMap[subresource.subresourceType].invoker(
-        subresource.url,
-        additionalAttributes)
-      .then(result => Object.assign(
-          {sourceContextUrl: location.toString()},
-          result));
-  }
-
-  // Defines invokers for each valid SourceContext.sourceContextType.
-  const sourceContextMap = {
-    "srcdoc": { // <iframe srcdoc></iframe>
-      invoker: invokeFromIframe,
-    },
-    "iframe": { // <iframe src="same-origin-URL"></iframe>
-      invoker: invokeFromIframe,
-    },
-    "worker-classic": {
-      // Classic dedicated worker loaded from same-origin.
-      invoker: invokeFromWorker.bind(undefined, false, {}),
-    },
-    "worker-classic-data": {
-      // Classic dedicated worker loaded from data: URL.
-      invoker: invokeFromWorker.bind(undefined, true, {}),
-    },
-    "worker-module": {
-      // Module dedicated worker loaded from same-origin.
-      invoker: invokeFromWorker.bind(undefined, false, {type: 'module'}),
-    },
-    "worker-module-data": {
-      // Module dedicated worker loaded from data: URL.
-      invoker: invokeFromWorker.bind(undefined, true, {type: 'module'}),
-    },
-  };
-
-  return sourceContextMap[sourceContextList[0].sourceContextType].invoker(
-      subresource, sourceContextList);
-}
-
-// Quick hack to expose invokeRequest when common.js is loaded either
-// as a classic or module script.
-self.invokeRequest = invokeRequest;
-
-/**
-  invokeFrom*() functions are helper functions with the same parameters
-  and return values as invokeRequest(), that are tied to specific types
-  of top-most environment settings objects.
-  For example, invokeFromIframe() is the helper function for the cases where
-  sourceContextList[0] is an iframe.
-*/
-
-/**
-  @param {boolean} isDataUrl
-    true if the worker script is loaded from data: URL.
-    Otherwise, the script is loaded from same-origin.
-  @param {object} workerOptions
-    The `options` argument for Worker constructor.
-
-  Other parameters and return values are the same as those of invokeRequest().
-*/
-function invokeFromWorker(isDataUrl, workerOptions,
-                          subresource, sourceContextList) {
-  const currentSourceContext = sourceContextList[0];
-  let workerUrl =
-    "/common/security-features/scope/worker.py?policyDeliveries=" +
-    encodeURIComponent(JSON.stringify(
-        currentSourceContext.policyDeliveries || []));
-  if (workerOptions.type === 'module') {
-    workerUrl += "&type=module";
-  }
-
-  let promise;
-  if (isDataUrl) {
-    promise = fetch(workerUrl)
-      .then(r => r.text())
-      .then(source => {
-          return 'data:text/javascript;base64,' + btoa(source);
-        });
-  } else {
-    promise = Promise.resolve(workerUrl);
-  }
-
-  return promise
-    .then(url => {
-      const worker = new Worker(url, workerOptions);
-      worker.postMessage({subresource: subresource,
-                          sourceContextList: sourceContextList.slice(1)});
-      return bindEvents2(worker, "message", worker, "error", window, "error");
-    })
-    .then(event => {
-        if (event.data.error)
-          return Promise.reject(event.data.error);
-        return event.data;
-      });
-}
-
-function invokeFromIframe(subresource, sourceContextList) {
-  const currentSourceContext = sourceContextList[0];
-  const frameUrl =
-    "/common/security-features/scope/document.py?policyDeliveries=" +
-    encodeURIComponent(JSON.stringify(
-        currentSourceContext.policyDeliveries || []));
-
-  let promise;
-  if (currentSourceContext.sourceContextType === 'srcdoc') {
-    promise = fetch(frameUrl)
-      .then(r => r.text())
-      .then(srcdoc => {
-          return createElement("iframe", {srcdoc: srcdoc}, document.body, true);
-        });
-  } else if (currentSourceContext.sourceContextType === 'iframe') {
-    promise = Promise.resolve(
-        createElement("iframe", {src: frameUrl}, document.body, true));
-  }
-
-  return promise
-    .then(iframe => {
-        return iframe.eventPromise
-          .then(() => {
-              const promise = bindEvents2(
-                  window, "message", iframe, "error", window, "error");
-              iframe.contentWindow.postMessage(
-                  {subresource: subresource,
-                   sourceContextList: sourceContextList.slice(1)},
-                  "*");
-              return promise;
-            })
-          .then(event => {
-              if (event.data.error)
-                return Promise.reject(event.data.error);
-              return event.data;
-            });
-      });
-}
-
-// SanityChecker does nothing in release mode. See sanity-checker.js for debug
-// mode.
-function SanityChecker() {}
-SanityChecker.prototype.checkScenario = function() {};
-SanityChecker.prototype.setFailTimeout = function(test, timeout) {};
-SanityChecker.prototype.checkSubresourceResult = function() {};
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/resources/common.js.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/resources/common.js.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/resources/common.js.headers	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/resources/common.js.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Access-Control-Allow-Origin: *
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/resources/common.sub.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/resources/common.sub.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/resources/common.sub.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/resources/common.sub.js	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1,1226 @@
+/**
+ * @fileoverview Utilities for mixed-content in Web Platform Tests.
+ * @author burnik@google.com (Kristijan Burnik)
+ * Disclaimer: Some methods of other authors are annotated in the corresponding
+ *     method's JSDoc.
+ */
+
+// ===============================================================
+// Types
+// ===============================================================
+// Objects of the following types are used to represent what kind of
+// subresource requests should be sent with what kind of policies,
+// from what kind of possibly nested source contexts.
+// The objects are represented as JSON objects (not JavaScript/Python classes
+// in a strict sense) to be passed between JavaScript/Python code.
+
+// Note: So far this document covers:
+// - resources/common.sub.js : client-side test infra code
+// - scope/ - server-side scripts that serves nested source contexts
+// but doesn't cover:
+// - tools/ - generator scripts that generates top-level HTML documents.
+// There are some policies only handled by generators (e.g. mixed-content
+// opt-ins) and not yet covered by the docs here.
+
+/**
+  @typedef PolicyDelivery
+  @type {object}
+  Referrer policy etc. can be applied/delivered in several ways.
+  A PolicyDelivery object specifies what policy is delivered and how.
+
+  @property {string} deliveryType
+    Specifies how the policy is delivered.
+    The valid deliveryType are:
+
+     "attr"
+        [A] DOM attributes e.g. referrerPolicy.
+
+      "rel-noref"
+        [A] <link rel="noreferrer"> (referrer-policy only).
+
+      "http-rp"
+        [B] HTTP response headers.
+
+      "meta"
+        [B] <meta> elements.
+
+  @property {string} key
+  @property {string} value
+    Specifies what policy to be delivered. The valid keys are:
+
+      "referrerPolicy"
+        Referrer Policy
+        https://w3c.github.io/webappsec-referrer-policy/
+        Valid values are those listed in
+        https://w3c.github.io/webappsec-referrer-policy/#referrer-policy
+        (except that "" is represented as null/None)
+
+  A PolicyDelivery can be specified in several ways:
+
+  - (for [A]) Associated with an individual subresource request and
+    specified in `Subresource.policies`,
+    e.g. referrerPolicy attributes of DOM elements.
+    This is handled in invokeRequest().
+
+  - (for [B]) Associated with an nested environmental settings object and
+    specified in `SourceContext.policies`,
+    e.g. HTTP referrer-policy response headers of HTML/worker scripts.
+    This is handled in server-side under /common/security-features/scope/.
+
+  - (for [B]) Associated with the top-level HTML document.
+    This is handled by the generators.d
+*/
+
+/**
+  @typedef Subresource
+  @type {object}
+  A Subresource represents how a subresource request is sent.
+
+  @property{SubresourceType} subresourceType
+    How the subresource request is sent,
+    e.g. "img-tag" for sending a request via <img src>.
+    See the keys of `subresourceMap` for valid values.
+
+  @property{string} url
+    subresource's URL.
+    Typically this is constructed by getRequestURLs() below.
+
+  @property{PolicyDelivery} policyDeliveries
+    Policies delivered specific to the subresource request.
+*/
+
+/**
+  @typedef SourceContext
+  @type {object}
+  Requests can be possibly sent from various kinds of source contexts, i.e.
+  fetch client's environment settings objects:
+  top-level windows, iframes, or workers.
+  A SourceContext object specifies one environment settings object, and
+  an Array<SourceContext> specifies a possibly nested context,
+  from the outer-most to inner-most environment settings objects.
+
+  For example:
+    [{sourceContextType: "srcdoc"}, {sourceContextType: "worker-classic"}]
+  means that a subresource request is to be sent from
+  a classic dedicated worker created from <iframe srcdoc>
+  inside the top-level HTML document.
+  Note: the top-level document is not included in the array and
+  is assumed implicitly.
+
+  SourceContext (or Array<SourceContext>) is set based on
+  the fetch client's settings object that is used for the subresource request,
+  NOT on module map settings object, and
+  NOT on the inner-most settings object that appears in the test.
+  For example, Array<SourceContext> is `[]` (indicating the top Window)
+  for `worker.js`
+  - When it is the root worker script: `new Worker('worker.js')`, or
+  - When it is imported from the root worker script:
+    `new Worker('top.js', {type: 'module'})`
+    where `top.js` has `import 'worker.js'`.
+  because the request for `worker.js` uses the Window as its fetch client's
+  settings object, while a WorkerGlobalScope is created though.
+
+  @property {string} sourceContextType
+    Kind of the source context to be used.
+    Valid values are the keys of `sourceContextMap` below.
+
+  @property {Array<PolicyDelivery>} policyDeliveries
+    A list of PolicyDelivery applied to the source context.
+*/
+
+// ===============================================================
+// General utility functions
+// ===============================================================
+
+function timeoutPromise(t, ms) {
+  return new Promise(resolve => { t.step_timeout(resolve, ms); });
+}
+
+/**
+ * Normalizes the target port for use in a URL. For default ports, this is the
+ *     empty string (omitted port), otherwise it's a colon followed by the port
+ *     number. Ports 80, 443 and an empty string are regarded as default ports.
+ * @param {number} targetPort The port to use
+ * @return {string} The port portion for using as part of a URL.
+ */
+function getNormalizedPort(targetPort) {
+  return ([80, 443, ""].indexOf(targetPort) >= 0) ? "" : ":" + targetPort;
+}
+
+/**
+ * Creates a GUID.
+ *     See: https://en.wikipedia.org/wiki/Globally_unique_identifier
+ *     Original author: broofa (http://www.broofa.com/)
+ *     Sourced from: http://stackoverflow.com/a/2117523/4949715
+ * @return {string} A pseudo-random GUID.
+ */
+function guid() {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+    var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+    return v.toString(16);
+  });
+}
+
+/**
+ * Initiates a new XHR via GET.
+ * @param {string} url The endpoint URL for the XHR.
+ * @param {string} responseType Optional - how should the response be parsed.
+ *     Default is "json".
+ *     See: https://xhr.spec.whatwg.org/#dom-xmlhttprequest-responsetype
+ * @return {Promise} A promise wrapping the success and error events.
+ */
+function xhrRequest(url, responseType) {
+  return new Promise(function(resolve, reject) {
+    var xhr = new XMLHttpRequest();
+    xhr.open('GET', url, true);
+    xhr.responseType = responseType || "json";
+
+    xhr.addEventListener("error", function() {
+      reject(Error("Network Error"));
+    });
+
+    xhr.addEventListener("load", function() {
+      if (xhr.status != 200)
+        reject(Error(xhr.statusText));
+      else
+        resolve(xhr.response);
+    });
+
+    xhr.send();
+  });
+}
+
+/**
+ * Sets attributes on a given DOM element.
+ * @param {DOMElement} element The element on which to set the attributes.
+ * @param {object} An object with keys (serving as attribute names) and values.
+ */
+function setAttributes(el, attrs) {
+  attrs = attrs || {}
+  for (var attr in attrs) {
+    if (attr !== 'src')
+      el.setAttribute(attr, attrs[attr]);
+  }
+  // Workaround for Chromium: set <img>'s src attribute after all other
+  // attributes to ensure the policy is applied.
+  for (var attr in attrs) {
+    if (attr === 'src')
+      el.setAttribute(attr, attrs[attr]);
+  }
+}
+
+/**
+ * Binds to success and error events of an object wrapping them into a promise
+ *     available through {@code element.eventPromise}. The success event
+ *     resolves and error event rejects.
+ * This method adds event listeners, and then removes all the added listeners
+ * when one of listened event is fired.
+ * @param {object} element An object supporting events on which to bind the
+ *     promise.
+ * @param {string} resolveEventName [="load"] The event name to bind resolve to.
+ * @param {string} rejectEventName [="error"] The event name to bind reject to.
+ */
+function bindEvents(element, resolveEventName, rejectEventName) {
+  element.eventPromise =
+      bindEvents2(element, resolveEventName, element, rejectEventName);
+}
+
+// Returns a promise wrapping success and error events of objects.
+// This is a variant of bindEvents that can accept separate objects for each
+// events and two events to reject, and doesn't set `eventPromise`.
+//
+// When `resolveObject`'s `resolveEventName` event (default: "load") is
+// fired, the promise is resolved with the event.
+//
+// When `rejectObject`'s `rejectEventName` event (default: "error") or
+// `rejectObject2`'s `rejectEventName2` event (default: "error") is
+// fired, the promise is rejected.
+//
+// `rejectObject2` is optional.
+function bindEvents2(resolveObject, resolveEventName, rejectObject, rejectEventName, rejectObject2, rejectEventName2) {
+  return new Promise(function(resolve, reject) {
+    const actualResolveEventName = resolveEventName || "load";
+    const actualRejectEventName = rejectEventName || "error";
+    const actualRejectEventName2 = rejectEventName2 || "error";
+
+    const resolveHandler = function(event) {
+      cleanup();
+      resolve(event);
+    };
+
+    const rejectHandler = function(event) {
+      // Chromium starts propagating errors from worker.onerror to
+      // window.onerror. This handles the uncaught exceptions in tests.
+      event.preventDefault();
+      cleanup();
+      reject(event);
+    };
+
+    const cleanup = function() {
+      resolveObject.removeEventListener(actualResolveEventName, resolveHandler);
+      rejectObject.removeEventListener(actualRejectEventName, rejectHandler);
+      if (rejectObject2) {
+        rejectObject2.removeEventListener(actualRejectEventName2, rejectHandler);
+      }
+    };
+
+    resolveObject.addEventListener(actualResolveEventName, resolveHandler);
+    rejectObject.addEventListener(actualRejectEventName, rejectHandler);
+    if (rejectObject2) {
+      rejectObject2.addEventListener(actualRejectEventName2, rejectHandler);
+    }
+  });
+}
+
+/**
+ * Creates a new DOM element.
+ * @param {string} tagName The type of the DOM element.
+ * @param {object} attrs A JSON with attributes to apply to the element.
+ * @param {DOMElement} parent Optional - an existing DOM element to append to
+ *     If not provided, the returned element will remain orphaned.
+ * @param {boolean} doBindEvents Optional - Whether to bind to load and error
+ *     events and provide the promise wrapping the events via the element's
+ *     {@code eventPromise} property. Default value evaluates to false.
+ * @return {DOMElement} The newly created DOM element.
+ */
+function createElement(tagName, attrs, parentNode, doBindEvents) {
+  var element = document.createElement(tagName);
+
+  if (doBindEvents)
+    bindEvents(element);
+
+  // We set the attributes after binding to events to catch any
+  // event-triggering attribute changes. E.g. form submission.
+  //
+  // But be careful with images: unlike other elements they will start the load
+  // as soon as the attr is set, even if not in the document yet, and sometimes
+  // complete it synchronously, so the append doesn't have the effect we want.
+  // So for images, we want to set the attrs after appending, whereas for other
+  // elements we want to do it before appending.
+  var isImg = (tagName == "img");
+  if (!isImg)
+    setAttributes(element, attrs);
+
+  if (parentNode)
+    parentNode.appendChild(element);
+
+  if (isImg)
+    setAttributes(element, attrs);
+
+  return element;
+}
+
+function createRequestViaElement(tagName, attrs, parentNode) {
+  return createElement(tagName, attrs, parentNode, true).eventPromise;
+}
+
+/**
+ * Creates a new empty iframe and appends it to {@code document.body} .
+ * @param {string} name The name and ID of the new iframe.
+ * @param {boolean} doBindEvents Whether to bind load and error events.
+ * @return {DOMElement} The newly created iframe.
+ */
+function createHelperIframe(name, doBindEvents) {
+  return createElement("iframe",
+                       {"name": name, "id": name},
+                       document.body,
+                       doBindEvents);
+}
+
+function wrapResult(server_data) {
+  if (typeof(server_data) === "string") {
+    throw server_data;
+  }
+  return {
+    referrer: server_data.headers.referer,
+    headers: server_data.headers
+  }
+}
+
+// ===============================================================
+// Subresources
+// ===============================================================
+
+/**
+  @typedef RequestResult
+  @type {object}
+  Represents the result of sending an request.
+  All properties are optional. See the comments for
+  requestVia*() and invokeRequest() below to see which properties are set.
+
+  @property {Array<Object<string, string>>} headers
+    HTTP request headers sent to server.
+  @property {string} referrer - Referrer.
+  @property {string} location - The URL of the subresource.
+  @property {string} sourceContextUrl
+    the URL of the global object where the actual request is sent.
+*/
+
+/**
+  requestVia*(url, additionalAttributes) functions send a subresource
+  request from the current environment settings object.
+
+  @param {string} url
+    The URL of the subresource.
+  @param {Object<string, string>} additionalAttributes
+    Additional attributes set to DOM elements
+    (element-initiated requests only).
+
+  @returns {Promise} that are resolved with a RequestResult object
+  on successful requests.
+
+  - Category 1:
+      `headers`: set.
+      `referrer`: set via `document.referrer`.
+      `location`: set via `document.location`.
+      See `template/document.html.template`.
+  - Category 2:
+      `headers`: set.
+      `referrer`: set to `headers.referer` by `wrapResult()`.
+      `location`: not set.
+  - Category 3:
+      All the keys listed above are NOT set.
+  `sourceContextUrl` is not set here.
+
+  -------------------------------- -------- --------------------------
+  Function name                    Category Used in
+                                            -------- ------- ---------
+                                            referrer mixed-  upgrade-
+                                            policy   content insecure-
+                                            policy   content request
+  -------------------------------- -------- -------- ------- ---------
+  requestViaAnchor                 1        Y        Y       -
+  requestViaArea                   1        Y        Y       -
+  requestViaAudio                  3        -        Y       -
+  requestViaDedicatedWorker        2        Y        Y       Y
+  requestViaFetch                  2        Y        Y       -
+  requestViaForm                   3        -        Y       -
+  requestViaIframe                 1        Y        Y       -
+  requestViaImage                  2        Y        Y       -
+  requestViaLinkPrefetch           3        -        Y       -
+  requestViaLinkStylesheet         3        -        Y       -
+  requestViaObject                 3        -        Y       -
+  requestViaPicture                3        -        Y       -
+  requestViaScript                 2        Y        Y       -
+  requestViaSendBeacon             3        -        Y       -
+  requestViaSharedWorker           2        Y        -       -
+  requestViaVideo                  3        -        Y       -
+  requestViaWebSocket              3        -        Y       -
+  requestViaWorklet                3        -        Y       Y
+  requestViaXhr                    2        Y        Y       -
+  -------------------------------- -------- -------- ------- ---------
+*/
+
+/**
+ * Creates a new iframe, binds load and error events, sets the src attribute and
+ *     appends it to {@code document.body} .
+ * @param {string} url The src for the iframe.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaIframe(url, additionalAttributes) {
+  const iframe = createElement(
+      "iframe",
+      Object.assign({"src": url}, additionalAttributes),
+      document.body,
+      false);
+  return bindEvents2(window, "message", iframe, "error", window, "error")
+      .then(event => {
+          if (event.source !== iframe.contentWindow)
+            return Promise.reject(new Error('Unexpected event.source'));
+          return event.data;
+        });
+}
+
+/**
+ * Creates a new image, binds load and error events, sets the src attribute and
+ *     appends it to {@code document.body} .
+ * @param {string} url The src for the image.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaImage(url, additionalAttributes) {
+  const img = createElement(
+      "img",
+      // crossOrigin attribute is added to read the pixel data of the response.
+      Object.assign({"src": url, "crossOrigin": "Anonymous"}, additionalAttributes),
+      document.body, true);
+  return img.eventPromise.then(() => wrapResult(decodeImageData(img)));
+}
+
+// Helper for requestViaImage().
+function decodeImageData(img) {
+  var canvas = document.createElement("canvas");
+  var context = canvas.getContext('2d');
+  context.drawImage(img, 0, 0);
+  var imgData = context.getImageData(0, 0, img.clientWidth, img.clientHeight);
+  const rgba = imgData.data;
+
+  let decodedBytes = new Uint8ClampedArray(rgba.length);
+  let decodedLength = 0;
+
+  for (var i = 0; i + 12 <= rgba.length; i += 12) {
+    // A single byte is encoded in three pixels. 8 pixel octets (among
+    // 9 octets = 3 pixels * 3 channels) are used to encode 8 bits,
+    // the most significant bit first, where `0` and `255` in pixel values
+    // represent `0` and `1` in bits, respectively.
+    // This encoding is used to avoid errors due to different color spaces.
+    const bits = [];
+    for (let j = 0; j < 3; ++j) {
+      bits.push(rgba[i + j * 4 + 0]);
+      bits.push(rgba[i + j * 4 + 1]);
+      bits.push(rgba[i + j * 4 + 2]);
+      // rgba[i + j * 4 + 3]: Skip alpha channel.
+    }
+    // The last one element is not used.
+    bits.pop();
+
+    // Decode a single byte.
+    let byte = 0;
+    for (let j = 0; j < 8; ++j) {
+      byte <<= 1;
+      if (bits[j] >= 128)
+        byte |= 1;
+    }
+
+    // Zero is the string terminator.
+    if (byte == 0)
+      break;
+
+    decodedBytes[decodedLength++] = byte;
+  }
+
+  // Remove trailing nulls from data.
+  decodedBytes = decodedBytes.subarray(0, decodedLength);
+  var string_data = (new TextDecoder("ascii")).decode(decodedBytes);
+
+  return JSON.parse(string_data);
+}
+
+/**
+ * Initiates a new XHR GET request to provided URL.
+ * @param {string} url The endpoint URL for the XHR.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaXhr(url) {
+  return xhrRequest(url).then(result => wrapResult(result));
+}
+
+/**
+ * Initiates a new GET request to provided URL via the Fetch API.
+ * @param {string} url The endpoint URL for the Fetch.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaFetch(url) {
+  return fetch(url)
+    .then(res => res.json())
+    .then(j => wrapResult(j));
+}
+
+function dedicatedWorkerUrlThatFetches(url) {
+  return `data:text/javascript,
+    fetch('${url}')
+      .then(r => r.json())
+      .then(j => postMessage(j))
+      .catch((e) => postMessage(e.message));`;
+}
+
+function workerUrlThatImports(url) {
+  return `data:text/javascript,import '${url}';`;
+}
+
+/**
+ * Creates a new Worker, binds message and error events wrapping them into.
+ *     {@code worker.eventPromise} and posts an empty string message to start
+ *     the worker.
+ * @param {string} url The endpoint URL for the worker script.
+ * @param {object} options The options for Worker constructor.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaDedicatedWorker(url, options) {
+  var worker;
+  try {
+    worker = new Worker(url, options);
+  } catch (e) {
+    return Promise.reject(e);
+  }
+  worker.postMessage('');
+  return bindEvents2(worker, "message", worker, "error")
+    .then(event => wrapResult(event.data));
+}
+
+function requestViaSharedWorker(url) {
+  var worker;
+  try {
+    worker = new SharedWorker(url);
+  } catch(e) {
+    return Promise.reject(e);
+  }
+  const promise = bindEvents2(worker.port, "message", worker, "error")
+    .then(event => wrapResult(event.data));
+  worker.port.start();
+  return promise;
+}
+
+// Returns a reference to a worklet object corresponding to a given type.
+function get_worklet(type) {
+  if (type == 'animation')
+    return CSS.animationWorklet;
+  if (type == 'layout')
+    return CSS.layoutWorklet;
+  if (type == 'paint')
+    return CSS.paintWorklet;
+  if (type == 'audio')
+    return new OfflineAudioContext(2,44100*40,44100).audioWorklet;
+
+  throw new Error('unknown worklet type is passed.');
+}
+
+function requestViaWorklet(type, url) {
+  try {
+    return get_worklet(type).addModule(url);
+  } catch (e) {
+    return Promise.reject(e);
+  }
+}
+
+/**
+ * Sets the href attribute on a navigable DOM element and performs a navigation
+ *     by clicking it. To avoid navigating away from the current execution
+ *     context, a target attribute is set to point to a new helper iframe.
+ * @param {DOMElement} navigableElement The navigable DOMElement
+ * @param {string} url The href for the navigable element.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaNavigable(navigableElement, url) {
+  var iframe = createHelperIframe(guid(), false);
+  setAttributes(navigableElement,
+                {"href": url,
+                 "target": iframe.name});
+
+  const promise =
+    bindEvents2(window, "message", iframe, "error", window, "error")
+      .then(event => {
+          if (event.source !== iframe.contentWindow)
+            return Promise.reject(new Error('Unexpected event.source'));
+          return event.data;
+        });
+  navigableElement.click();
+  return promise;
+}
+
+/**
+ * Creates a new anchor element, appends it to {@code document.body} and
+ *     performs the navigation.
+ * @param {string} url The URL to navigate to.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaAnchor(url, additionalAttributes) {
+  var a = createElement(
+      "a",
+      Object.assign({"innerHTML": "Link to resource"}, additionalAttributes),
+      document.body);
+
+  return requestViaNavigable(a, url);
+}
+
+/**
+ * Creates a new area element, appends it to {@code document.body} and performs
+ *     the navigation.
+ * @param {string} url The URL to navigate to.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaArea(url, additionalAttributes) {
+  var area = createElement(
+      "area",
+      Object.assign({}, additionalAttributes),
+      document.body);
+
+  // TODO(kristijanburnik): Append to map and add image.
+  return requestViaNavigable(area, url);
+}
+
+/**
+ * Creates a new script element, sets the src to url, and appends it to
+ *     {@code document.body}.
+ * @param {string} url The src URL.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaScript(url, additionalAttributes) {
+  const script = createElement(
+      "script",
+      Object.assign({"src": url}, additionalAttributes),
+      document.body,
+      false);
+
+  return bindEvents2(window, "message", script, "error", window, "error")
+    .then(event => wrapResult(event.data));
+}
+
+/**
+ * Creates a new form element, sets attributes, appends it to
+ *     {@code document.body} and submits the form.
+ * @param {string} url The URL to submit to.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaForm(url) {
+  var iframe = createHelperIframe(guid());
+  var form = createElement("form",
+                           {"action": url,
+                            "method": "POST",
+                            "target": iframe.name},
+                           document.body);
+  bindEvents(iframe);
+  form.submit();
+
+  return iframe.eventPromise;
+}
+
+/**
+ * Creates a new link element for a stylesheet, binds load and error events,
+ *     sets the href to url and appends it to {@code document.head}.
+ * @param {string} url The URL for a stylesheet.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaLinkStylesheet(url) {
+  return createRequestViaElement("link",
+                                 {"rel": "stylesheet", "href": url},
+                                 document.head);
+}
+
+/**
+ * Creates a new link element for a prefetch, binds load and error events, sets
+ *     the href to url and appends it to {@code document.head}.
+ * @param {string} url The URL of a resource to prefetch.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaLinkPrefetch(url) {
+  var link = document.createElement('link');
+  if (link.relList && link.relList.supports && link.relList.supports("prefetch")) {
+    return createRequestViaElement("link",
+                                   {"rel": "prefetch", "href": url},
+                                   document.head);
+  } else {
+    return Promise.reject("This browser does not support 'prefetch'.");
+  }
+}
+
+/**
+ * Initiates a new beacon request.
+ * @param {string} url The URL of a resource to prefetch.
+ * @return {Promise} The promise for success/error events.
+ */
+async function requestViaSendBeacon(url) {
+  function wait(ms) {
+    return new Promise(resolve => step_timeout(resolve, ms));
+  }
+  if (!navigator.sendBeacon(url)) {
+    // If mixed-content check fails, it should return false.
+    throw new Error('sendBeacon() fails.');
+  }
+  // We don't have a means to see the result of sendBeacon() request
+  // for sure. Let's wait for a while and let the generic test function
+  // ask the server for the result.
+  await wait(500);
+  return 'allowed';
+}
+
+/**
+ * Creates a new media element with a child source element, binds loadeddata and
+ *     error events, sets attributes and appends to document.body.
+ * @param {string} type The type of the media element (audio/video/picture).
+ * @param {object} media_attrs The attributes for the media element.
+ * @param {object} source_attrs The attributes for the child source element.
+ * @return {DOMElement} The newly created media element.
+ */
+function createMediaElement(type, media_attrs, source_attrs) {
+  var mediaElement = createElement(type, {});
+
+  var sourceElement = createElement("source", {});
+
+  mediaElement.eventPromise = new Promise(function(resolve, reject) {
+    mediaElement.addEventListener("loadeddata", function (e) {
+      resolve(e);
+    });
+
+    // Safari doesn't fire an `error` event when blocking mixed content.
+    mediaElement.addEventListener("stalled", function(e) {
+      reject(e);
+    });
+
+    sourceElement.addEventListener("error", function(e) {
+      reject(e);
+    });
+  });
+
+  setAttributes(mediaElement, media_attrs);
+  setAttributes(sourceElement, source_attrs);
+
+  mediaElement.appendChild(sourceElement);
+  document.body.appendChild(mediaElement);
+
+  return mediaElement;
+}
+
+/**
+ * Creates a new video element, binds loadeddata and error events, sets
+ *     attributes and source URL and appends to {@code document.body}.
+ * @param {string} url The URL of the video.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaVideo(url) {
+  return createMediaElement("video",
+                            {},
+                            {"src": url}).eventPromise;
+}
+
+/**
+ * Creates a new audio element, binds loadeddata and error events, sets
+ *     attributes and source URL and appends to {@code document.body}.
+ * @param {string} url The URL of the audio.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaAudio(url) {
+  return createMediaElement("audio",
+                            {},
+                            {"type": "audio/wav", "src": url}).eventPromise;
+}
+
+/**
+ * Creates a new picture element, binds loadeddata and error events, sets
+ *     attributes and source URL and appends to {@code document.body}. Also
+ *     creates new image element appending it to the picture
+ * @param {string} url The URL of the image for the source and image elements.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaPicture(url) {
+  var picture = createMediaElement("picture", {}, {"srcset": url,
+                                                "type": "image/png"});
+  return createRequestViaElement("img", {"src": url}, picture);
+}
+
+/**
+ * Creates a new object element, binds load and error events, sets the data to
+ *     url, and appends it to {@code document.body}.
+ * @param {string} url The data URL.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaObject(url) {
+  return createRequestViaElement("object", {"data": url, "type": "text/html"}, document.body);
+}
+
+/**
+ * Creates a new WebSocket pointing to {@code url} and sends a message string
+ * "echo". The {@code message} and {@code error} events are triggering the
+ * returned promise resolve/reject events.
+ * @param {string} url The URL for WebSocket to connect to.
+ * @return {Promise} The promise for success/error events.
+ */
+function requestViaWebSocket(url) {
+  return new Promise(function(resolve, reject) {
+    var websocket = new WebSocket(url);
+
+    websocket.addEventListener("message", function(e) {
+      resolve(e.data);
+    });
+
+    websocket.addEventListener("open", function(e) {
+      websocket.send("echo");
+    });
+
+    websocket.addEventListener("error", function(e) {
+      reject(e)
+    });
+  })
+  .then(data => {
+      return JSON.parse(data);
+    });
+}
+
+/**
+  @typedef SubresourceType
+  @type {string}
+
+  Represents how a subresource is sent.
+  The keys of `subresourceMap` below are the valid values.
+*/
+
+// Subresource paths and invokers.
+const subresourceMap = {
+  "a-tag": {
+    path: "/common/security-features/subresource/document.py",
+    invoker: requestViaAnchor,
+  },
+  "area-tag": {
+    path: "/common/security-features/subresource/document.py",
+    invoker: requestViaArea,
+  },
+  "audio-tag": {
+    path: "/common/security-features/subresource/audio.py",
+    invoker: requestViaAudio,
+  },
+  "beacon": {
+    path: "/common/security-features/subresource/empty.py",
+    invoker: requestViaSendBeacon,
+  },
+  "fetch": {
+    path: "/common/security-features/subresource/xhr.py",
+    invoker: requestViaFetch,
+  },
+  "form-tag": {
+    path: "/common/security-features/subresource/empty.py",
+    invoker: requestViaForm,
+  },
+  "iframe-tag": {
+    path: "/common/security-features/subresource/document.py",
+    invoker: requestViaIframe,
+  },
+  "img-tag": {
+    path: "/common/security-features/subresource/image.py",
+    invoker: requestViaImage,
+  },
+  "link-css-tag": {
+    path: "/common/security-features/subresource/empty.py",
+    invoker: requestViaLinkStylesheet,
+  },
+  "link-prefetch-tag": {
+    path: "/common/security-features/subresource/empty.py",
+    invoker: requestViaLinkPrefetch,
+  },
+  "object-tag": {
+    path: "/common/security-features/subresource/empty.py",
+    invoker: requestViaObject,
+  },
+  "picture-tag": {
+    path: "/common/security-features/subresource/image.py",
+    invoker: requestViaPicture,
+  },
+  "script-tag": {
+    path: "/common/security-features/subresource/script.py",
+    invoker: requestViaScript,
+  },
+  "video-tag": {
+    path: "/common/security-features/subresource/video.py",
+    invoker: requestViaVideo,
+  },
+  "xhr": {
+    path: "/common/security-features/subresource/xhr.py",
+    invoker: requestViaXhr,
+  },
+
+  "worker-classic": {
+    path: "/common/security-features/subresource/worker.py",
+    invoker: url => requestViaDedicatedWorker(url),
+  },
+  "worker-module": {
+    path: "/common/security-features/subresource/worker.py",
+    invoker: url => requestViaDedicatedWorker(url, {type: "module"}),
+  },
+  "worker-import-data": {
+    path: "/common/security-features/subresource/worker.py",
+    invoker: url =>
+        requestViaDedicatedWorker(workerUrlThatImports(url), {type: "module"}),
+  },
+  "sharedworker-classic": {
+    path: "/common/security-features/subresource/shared-worker.py",
+    invoker: requestViaSharedWorker,
+  },
+
+  "websocket": {
+    path: "/stash_responder",
+    invoker: requestViaWebSocket,
+  },
+};
+for (const workletType of ['animation', 'audio', 'layout', 'paint']) {
+  subresourceMap[`worklet-${workletType}`] = {
+      path: "/common/security-features/subresource/worker.py",
+      invoker: url => requestViaWorklet(workletType, url)
+    };
+  subresourceMap[`worklet-${workletType}-import-data`] = {
+      path: "/common/security-features/subresource/worker.py",
+      invoker: url =>
+          requestViaWorklet(workletType, workerUrlThatImports(url))
+    };
+}
+
+/**
+  @typedef RedirectionType
+  @type {string}
+
+  Represents what redirects should occur to the subresource request
+  after initial request.
+  See preprocess_redirection() in
+  /common/security-features/subresource/subresource.py for valid values.
+*/
+
+/**
+  Construct subresource (and related) origin.
+
+  @param {string} originType
+  @returns {object} the origin of the subresource.
+*/
+function getSubresourceOrigin(originType) {
+  const httpProtocol = "http";
+  const httpsProtocol = "https";
+  const wsProtocol = "ws";
+  const wssProtocol = "wss";
+
+  const sameOriginHost = "{{host}}";
+  const crossOriginHost = "{{domains[www1]}}";
+
+  // These values can evaluate to either empty strings or a ":port" string.
+  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
+  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
+  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
+  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
+
+  /**
+    @typedef OriginType
+    @type {string}
+
+    Represents the origin of the subresource request URL.
+    The keys of `originMap` below are the valid values.
+
+    Note that there can be redirects from the specified origin
+    (see RedirectionType), and thus the origin of the subresource
+    response URL might be different from what is specified by OriginType.
+  */
+  const originMap = {
+    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
+    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
+    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
+    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
+    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
+    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
+    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
+    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
+  };
+
+  return originMap[originType];
+}
+
+/**
+  Construct subresource (and related) URLs.
+
+  @param {SubresourceType} subresourceType
+  @param {OriginType} originType
+  @param {RedirectionType} redirectionType
+  @returns {object} with following properties:
+    {string} testUrl
+      The subresource request URL.
+    {string} announceUrl
+    {string} assertUrl
+      The URLs to be used for detecting whether `testUrl` is actually sent
+      to the server.
+      1. Fetch `announceUrl` first,
+      2. then possibly fetch `testUrl`, and
+      3. finally fetch `assertUrl`.
+         The fetch result of `assertUrl` should indicate whether
+         `testUrl` is actually sent to the server or not.
+*/
+function getRequestURLs(subresourceType, originType, redirectionType) {
+  const key = guid();
+  const value = guid();
+
+  // We use the same stash path for both HTTP/S and WS/S stash requests.
+  const stashPath = encodeURIComponent("/mixed-content");
+
+  const stashEndpoint = "/common/security-features/subresource/xhr.py?key=" +
+                        key + "&path=" + stashPath;
+  return {
+    testUrl:
+      getSubresourceOrigin(originType) +
+        subresourceMap[subresourceType].path +
+        "?redirection=" + encodeURIComponent(redirectionType) +
+        "&action=purge&key=" + key +
+        "&path=" + stashPath,
+    announceUrl: stashEndpoint + "&action=put&value=" + value,
+    assertUrl: stashEndpoint + "&action=take",
+  };
+}
+
+// ===============================================================
+// Source Context
+// ===============================================================
+// Requests can be sent from several source contexts,
+// such as the main documents, iframes, workers, or so,
+// possibly nested, and possibly with <meta>/http headers added.
+// invokeRequest() and invokeFrom*() functions handles
+// SourceContext-related setup in client-side.
+
+/**
+  invokeRequest() invokes a subresource request
+  (specified as `subresource`)
+  from a (possibly nested) environment settings object
+  (specified as `sourceContextList`).
+
+  For nested contexts, invokeRequest() calls an invokeFrom*() function
+  that creates a nested environment settings object using
+  /common/security-features/scope/, which calls invokeRequest()
+  again inside the nested environment settings object.
+  This cycle continues until all specified
+  nested environment settings object are created, and
+  finally invokeRequest() calls a requestVia*() function to start the
+  subresource request from the inner-most environment settings object.
+
+  @param {Subresource} subresource
+  @param {Array<SourceContext>} sourceContextList
+
+  @returns {Promise} A promise that is resolved with an RequestResult object.
+  `sourceContextUrl` is always set. For whether other properties are set,
+  see the comments for requestVia*() above.
+*/
+function invokeRequest(subresource, sourceContextList) {
+  if (sourceContextList.length === 0) {
+    // No further nested global objects. Send the subresource request here.
+
+    const additionalAttributes = {};
+    /** @type {PolicyDelivery} policyDelivery */
+    for (const policyDelivery of (subresource.policyDeliveries || [])) {
+      // Depending on the delivery method, extend the subresource element with
+      // these attributes.
+      if (policyDelivery.deliveryType === "attr") {
+        additionalAttributes[policyDelivery.key] = policyDelivery.value;
+      } else if (policyDelivery.deliveryType === "rel-noref") {
+        additionalAttributes["rel"] = "noreferrer";
+      }
+    }
+
+    return subresourceMap[subresource.subresourceType].invoker(
+        subresource.url,
+        additionalAttributes)
+      .then(result => Object.assign(
+          {sourceContextUrl: location.toString()},
+          result));
+  }
+
+  // Defines invokers for each valid SourceContext.sourceContextType.
+  const sourceContextMap = {
+    "srcdoc": { // <iframe srcdoc></iframe>
+      invoker: invokeFromIframe,
+    },
+    "iframe": { // <iframe src="same-origin-URL"></iframe>
+      invoker: invokeFromIframe,
+    },
+    "worker-classic": {
+      // Classic dedicated worker loaded from same-origin.
+      invoker: invokeFromWorker.bind(undefined, false, {}),
+    },
+    "worker-classic-data": {
+      // Classic dedicated worker loaded from data: URL.
+      invoker: invokeFromWorker.bind(undefined, true, {}),
+    },
+    "worker-module": {
+      // Module dedicated worker loaded from same-origin.
+      invoker: invokeFromWorker.bind(undefined, false, {type: 'module'}),
+    },
+    "worker-module-data": {
+      // Module dedicated worker loaded from data: URL.
+      invoker: invokeFromWorker.bind(undefined, true, {type: 'module'}),
+    },
+  };
+
+  return sourceContextMap[sourceContextList[0].sourceContextType].invoker(
+      subresource, sourceContextList);
+}
+
+// Quick hack to expose invokeRequest when common.sub.js is loaded either
+// as a classic or module script.
+self.invokeRequest = invokeRequest;
+
+/**
+  invokeFrom*() functions are helper functions with the same parameters
+  and return values as invokeRequest(), that are tied to specific types
+  of top-most environment settings objects.
+  For example, invokeFromIframe() is the helper function for the cases where
+  sourceContextList[0] is an iframe.
+*/
+
+/**
+  @param {boolean} isDataUrl
+    true if the worker script is loaded from data: URL.
+    Otherwise, the script is loaded from same-origin.
+  @param {object} workerOptions
+    The `options` argument for Worker constructor.
+
+  Other parameters and return values are the same as those of invokeRequest().
+*/
+function invokeFromWorker(isDataUrl, workerOptions,
+                          subresource, sourceContextList) {
+  const currentSourceContext = sourceContextList[0];
+  let workerUrl =
+    "/common/security-features/scope/worker.py?policyDeliveries=" +
+    encodeURIComponent(JSON.stringify(
+        currentSourceContext.policyDeliveries || []));
+  if (workerOptions.type === 'module') {
+    workerUrl += "&type=module";
+  }
+
+  let promise;
+  if (isDataUrl) {
+    promise = fetch(workerUrl)
+      .then(r => r.text())
+      .then(source => {
+          return 'data:text/javascript;base64,' + btoa(source);
+        });
+  } else {
+    promise = Promise.resolve(workerUrl);
+  }
+
+  return promise
+    .then(url => {
+      const worker = new Worker(url, workerOptions);
+      worker.postMessage({subresource: subresource,
+                          sourceContextList: sourceContextList.slice(1)});
+      return bindEvents2(worker, "message", worker, "error", window, "error");
+    })
+    .then(event => {
+        if (event.data.error)
+          return Promise.reject(event.data.error);
+        return event.data;
+      });
+}
+
+function invokeFromIframe(subresource, sourceContextList) {
+  const currentSourceContext = sourceContextList[0];
+  const frameUrl =
+    "/common/security-features/scope/document.py?policyDeliveries=" +
+    encodeURIComponent(JSON.stringify(
+        currentSourceContext.policyDeliveries || []));
+
+  let promise;
+  if (currentSourceContext.sourceContextType === 'srcdoc') {
+    promise = fetch(frameUrl)
+      .then(r => r.text())
+      .then(srcdoc => {
+          return createElement("iframe", {srcdoc: srcdoc}, document.body, true);
+        });
+  } else if (currentSourceContext.sourceContextType === 'iframe') {
+    promise = Promise.resolve(
+        createElement("iframe", {src: frameUrl}, document.body, true));
+  }
+
+  return promise
+    .then(iframe => {
+        return iframe.eventPromise
+          .then(() => {
+              const promise = bindEvents2(
+                  window, "message", iframe, "error", window, "error");
+              iframe.contentWindow.postMessage(
+                  {subresource: subresource,
+                   sourceContextList: sourceContextList.slice(1)},
+                  "*");
+              return promise;
+            })
+          .then(event => {
+              if (event.data.error)
+                return Promise.reject(event.data.error);
+              return event.data;
+            });
+      });
+}
+
+// SanityChecker does nothing in release mode. See sanity-checker.js for debug
+// mode.
+function SanityChecker() {}
+SanityChecker.prototype.checkScenario = function() {};
+SanityChecker.prototype.setFailTimeout = function(test, timeout) {};
+SanityChecker.prototype.checkSubresourceResult = function() {};
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/resources/common.sub.js.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/resources/common.sub.js.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/resources/common.sub.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/resources/common.sub.js.headers	2019-09-15 11:33:23.000000000 +0000
@@ -0,0 +1 @@
+Access-Control-Allow-Origin: *
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/scope/template/document.html.template firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/scope/template/document.html.template
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/scope/template/document.html.template	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/scope/template/document.html.template	2019-09-15 11:33:23.000000000 +0000
@@ -2,7 +2,7 @@
 <html>
   <head>
     %(meta)s
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script>
     // Receive a message from the parent and start the test.
     function onMessageFromParent(event) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/scope/worker.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/scope/worker.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/scope/worker.py	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/scope/worker.py	2019-09-15 11:33:23.000000000 +0000
@@ -7,7 +7,7 @@
 def main(request, response):
   policyDeliveries = json.loads(request.GET.first('policyDeliveries', '[]'))
   worker_type = request.GET.first('type', 'classic')
-  commonjs_url = '%s://%s:%s/common/security-features/resources/common.js' % (
+  commonjs_url = '%s://%s:%s/common/security-features/resources/common.sub.js' % (
       request.url_parts.scheme, request.url_parts.hostname,
       request.url_parts.port)
   if worker_type == 'classic':
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/subresource/subresource.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/subresource/subresource.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/subresource/subresource.py	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/subresource/subresource.py	2019-09-15 11:33:23.000000000 +0000
@@ -71,13 +71,13 @@
 
     if redirection == "no-redirect":
         return False
-    elif redirection == "keep-scheme-redirect":
+    elif redirection == "keep-scheme":
         redirect_url = create_url(request, swap_scheme=False)
-    elif redirection == "swap-scheme-redirect":
+    elif redirection == "swap-scheme":
         redirect_url = create_url(request, swap_scheme=True)
-    elif redirection == "keep-origin-redirect":
+    elif redirection == "keep-origin":
         redirect_url = create_url(request, swap_origin=False)
-    elif redirection == "swap-origin-redirect":
+    elif redirection == "swap-origin":
         redirect_url = create_url(request, swap_origin=True)
     else:
         raise ValueError("Invalid redirection type '%s'" % redirection)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/tools/template/test.debug.html.template firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/tools/template/test.debug.html.template
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/tools/template/test.debug.html.template	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/tools/template/test.debug.html.template	2019-09-15 11:33:24.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="%(test_description)s">%(meta_delivery_method)s
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <!-- The original specification JSON for validating the scenario. -->
     <script src="%(spec_json_js)s"></script>
     <!-- Internal checking of the tests -->
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/tools/template/test.release.html.template firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/tools/template/test.release.html.template
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/tools/template/test.release.html.template	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/tools/template/test.release.html.template	2019-09-15 11:33:23.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="%(test_description)s">%(meta_delivery_method)s
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="%(helper_js)s"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/tools/util.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/tools/util.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/common/security-features/tools/util.py	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/common/security-features/tools/util.py	2019-09-15 11:33:23.000000000 +0000
@@ -58,7 +58,8 @@
 
 class PolicyDelivery(object):
     '''
-    See `@typedef PolicyDelivery` comments in `resources/common.js`.
+    See `@typedef PolicyDelivery` comments in
+    `common/security-features/resources/common.sub.js`.
     '''
 
     def __init__(self, delivery_type, key, value):
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/CSS2/linebox/inline-negative-margin-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/CSS2/linebox/inline-negative-margin-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/CSS2/linebox/inline-negative-margin-001.html	2019-09-13 05:13:29.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/CSS2/linebox/inline-negative-margin-001.html	2019-09-15 11:33:24.000000000 +0000
@@ -6,6 +6,7 @@
 <link rel="help" href="https://crbug.com/979894">
 <link rel="help" href="https://drafts.csswg.org/css2/visudet.html#inline-width">
 <link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 html, body { margin: 0; }
 div {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/CSS2/linebox/vertical-align-negative-leading-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/CSS2/linebox/vertical-align-negative-leading-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/CSS2/linebox/vertical-align-negative-leading-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/CSS2/linebox/vertical-align-negative-leading-001.html	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Test vertical-align: top and bottom do not affect the line height</title>
+<link rel="match" href="vertical-align-negative-leading-001-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#propdef-vertical-align">
+<link rel="author" href="mailto:kojii@chromium.org">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+.container {
+  margin: 30px 0;
+  color: orange;
+  background-color: blue;
+  line-height: 10px;
+  font-size: 30px;
+  font-family: Ahem;
+}
+span { background: purple; }
+.top { vertical-align: top; }
+.bottom { vertical-align: bottom; }
+.text-top { vertical-align: text-top; }
+.text-bottom { vertical-align: text-bottom; }
+</style>
+<body>
+<div class="container">
+  <span class="top">XX</span>
+  <span>XX</span>
+  <span class="bottom">XX</span>
+</div>
+<div class="container">
+  <span class="text-top">XX</span>
+  <span>XX</span>
+  <span class="text-bottom">XX</span>
+</div>
+<div class="container"><span class="top">XX</span></div>
+<div class="container"><span class="bottom">XX</span></div>
+<div class="container"><span class="text-top">XX</span></div>
+<div class="container"><span class="text-bottom">XX</span></div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html	2019-09-15 11:33:25.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+.container {
+  margin: 30px 0;
+  color: orange;
+  background-color: blue;
+  line-height: 10px;
+  font-size: 30px;
+  font-family: Ahem;
+}
+.lh20 { line-height: 20px; }
+.lh30 { line-height: 30px; }
+.up5 { position: relative; top: -5px; }
+.up10 { position: relative; top: -10px; }
+.down5 { position: relative; top: 5px; }
+.down10 { position: relative; top: 10px; }
+</style>
+<body>
+<div class="container">
+  <span>XX</span>
+  <span>XX</span>
+  <span>XX</span>
+</div>
+<div class="container lh30">
+  <span class="up10">XX</span>
+  <span>XX</span>
+  <span class="down10">XX</span>
+</div>
+<div class="container"><span>XX</span></div>
+<div class="container"><span>XX</span></div>
+<div class="container lh20"><span class="up5">XX</span></div>
+<div class="container lh20"><span class="down5">XX</span></div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/CSS2/normal-flow/max-width-107.xht firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/CSS2/normal-flow/max-width-107.xht
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/CSS2/normal-flow/max-width-107.xht	2019-09-13 05:13:29.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/CSS2/normal-flow/max-width-107.xht	2019-09-15 11:33:25.000000000 +0000
@@ -14,7 +14,7 @@
 
   <meta content="ahem" name="flags" />
   <meta content="'max-width' specifies a fixed maximum used width. If the used width is greater than max-width, then the computed value of max-width is used as the computed value for width." name="assert" />
-
+  <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
   <style type="text/css"><![CDATA[
   div
   {
@@ -43,4 +43,4 @@
   <div id="control-green-overlapping">X</div>
 
  </body>
-</html>
\ No newline at end of file
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/CSS2/positioning/inline-static-position-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/CSS2/positioning/inline-static-position-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/CSS2/positioning/inline-static-position-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/CSS2/positioning/inline-static-position-001.html	2019-09-15 11:33:24.000000000 +0000
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<title>CSS Test: Static positions and line wrapping</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#static-position">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+.tests, .no-tests {
+  margin-bottom: 1em;
+  font-family: Ahem;
+  font-size: 10px;
+  line-height: 1;
+}
+.tests > div, .no-tests > div {
+  position: relative;
+  width: 10ch;
+  border: 1px solid blue;
+}
+.abs {
+  position: absolute;
+  color: orange;
+}
+</style>
+<body>
+  <section class="tests">
+    <div>12345<span class="abs" data-offset-x="50" data-offset-y="0">span</span>54321</div>
+    <div>123456<span class="abs" data-offset-x="60" data-offset-y="0">span</span>654321</div>
+    <div>12345<span class="abs" data-offset-x="50" data-offset-y="0">span</span> 54321</div>
+    <div>12345&nbsp;<span class="abs" data-offset-x="60" data-offset-y="0">span</span> 54321</div>
+    <div>12345&nbsp;<span class="abs" data-offset-x="60" data-offset-y="0">span</span>&nbsp;54321</div>
+  </section>
+  <section class="tests">
+    <!-- offsetTop is interoperable but offsetLeft is not due to white space collapsing. -->
+    <div>12345 <span class="abs" data-offset-y="0">span</span> 54321</div>
+  </section>
+  <section class="no-tests">
+    <!-- These tests are not interoperable. -->
+    <div>12345 <span class="abs">span</span>54321</div>
+    <div>12345 <span class="abs">span</span>&nbsp;54321</div>
+    <div>123456789012&nbsp;<span class="abs">span</span>&nbsp;54321</div>
+    <div>123456789012&nbsp;<span class="abs">span</span>&nbsp;543210987654321</div>
+  </section>
+<script>
+document.fonts.ready.then(()=> {
+  checkLayout('.tests .abs');
+});
+</script>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-backgrounds/animations/background-position-interpolation.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-backgrounds/animations/background-position-interpolation.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-backgrounds/animations/background-position-interpolation.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-backgrounds/animations/background-position-interpolation.html	2019-09-15 11:33:26.000000000 +0000
@@ -45,18 +45,20 @@
   {at: 1.25, expect:  '90px 90px, 90px 90px, 90px 90px, 90px 90px'},
 ]);
 
+// background-position's initial value is 0% 0%, and calcs involving percentages
+// are never resolved by the calc spec (even when the percentage is 0%).
 test_interpolation({
   property: 'background-position',
   from: 'initial',
   to: '80px 80px, 80px 80px, 80px 80px, 80px 80px',
 }, [
-  {at: -0.25, expect: '-20px -20px, -20px -20px, -20px -20px, -20px -20px'},
-  {at: 0, expect:     '  0%    0% ,   0%    0% ,   0%    0% ,   0%    0% '}, // TODO(alancutter): Should these be 0px?
-  {at: 0.25, expect:  ' 20px  20px,  20px  20px,  20px  20px,  20px  20px'},
-  {at: 0.5, expect:   ' 40px  40px,  40px  40px,  40px  40px,  40px  40px'},
-  {at: 0.75, expect:  ' 60px  60px,  60px  60px,  60px  60px,  60px  60px'},
-  {at: 1, expect:     ' 80px  80px,  80px  80px,  80px  80px,  80px  80px'},
-  {at: 1.25, expect:  '100px 100px, 100px 100px, 100px 100px, 100px 100px'},
+  {at: -0.25, expect: 'calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px)'},
+  {at: 0, expect:     '0% 0%, 0% 0%, 0% 0%, 0% 0%'},
+  {at: 0.25, expect:  'calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px)'},
+  {at: 0.5, expect:   'calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px)'},
+  {at: 0.75, expect:  'calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px)'},
+  {at: 1, expect:     'calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px)'},
+  {at: 1.25, expect:  'calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px)'},
 ]);
 
 test_interpolation({
@@ -73,18 +75,19 @@
   {at: 1.25, expect:  '85px 85px, 85px 85px, 85px 85px, 85px 85px'},
 ]);
 
+// background-position is not inherited, so 'unset' is equivalent to initial.
 test_interpolation({
   property: 'background-position',
   from: 'unset',
   to: '80px 80px, 80px 80px, 80px 80px, 80px 80px',
 }, [
-  {at: -0.25, expect: '-20px -20px, -20px -20px, -20px -20px, -20px -20px'},
-  {at: 0, expect:     '  0%    0% ,   0%    0% ,   0%    0% ,   0%    0% '},
-  {at: 0.25, expect:  ' 20px  20px,  20px  20px,  20px  20px,  20px  20px'},
-  {at: 0.5, expect:   ' 40px  40px,  40px  40px,  40px  40px,  40px  40px'},
-  {at: 0.75, expect:  ' 60px  60px,  60px  60px,  60px  60px,  60px  60px'},
-  {at: 1, expect:     ' 80px  80px,  80px  80px,  80px  80px,  80px  80px'},
-  {at: 1.25, expect:  '100px 100px, 100px 100px, 100px 100px, 100px 100px'},
+  {at: -0.25, expect: 'calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px)'},
+  {at: 0, expect:     '0% 0%, 0% 0%, 0% 0%, 0% 0%'},
+  {at: 0.25, expect:  'calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px)'},
+  {at: 0.5, expect:   'calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px)'},
+  {at: 0.75, expect:  'calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px)'},
+  {at: 1, expect:     'calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px)'},
+  {at: 1.25, expect:  'calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px)'},
 ]);
 
 // Test equal number of position values as background images.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-backgrounds/parsing/background-invalid.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-backgrounds/parsing/background-invalid.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-backgrounds/parsing/background-invalid.html	2019-09-13 05:13:29.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-backgrounds/parsing/background-invalid.html	2019-09-15 11:33:24.000000000 +0000
@@ -12,7 +12,11 @@
 </head>
 <body>
 <script>
+// <bg-layer> does not allow a <color>.
 test_invalid_value("background", "red, green");
+
+// A `/ <bg-size>` is only allowed directly after a <bg-position>.
+test_invalid_value("background", "black 0 url(https://example.invalid/) / cover");
 </script>
 </body>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-computed.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-computed.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-computed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-computed.html	2019-09-15 11:33:25.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Backgrounds and Borders Module Level 3: getComputedStyle().borderRadius</title>
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius">
+<meta name="assert" content="Computed value has computed length-percentage values.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("border-radius", "1px");
+test_computed_value("border-radius", "1px 2% 3px 4%");
+test_computed_value("border-radius", "5em / 1px 2% 3px 4%", "200px / 1px 2% 3px 4%");
+test_computed_value("border-radius", "1px 2% 3px 4% / 5em", "1px 2% 3px 4% / 200px");
+
+test_computed_value("border-radius", "1px 1px 1px 2% / 1px 2% 1px 2%", "1px 1px 1px 2% / 1px 2%");
+test_computed_value("border-radius", "1px 1px 1px 1px / 1px 1px 2% 1px", "1px / 1px 1px 2%");
+test_computed_value("border-radius", "1px 1px 2% 2%");
+test_computed_value("border-radius", "1px 2% 1px 1px");
+test_computed_value("border-radius", "1px 2% 2% 2% / 1px 2% 3px 2%", "1px 2% 2% / 1px 2% 3px");
+
+test_computed_value("border-top-left-radius", "calc(-0.5em + 10px)", "0px");
+test_computed_value("border-top-right-radius", "20%");
+test_computed_value("border-bottom-right-radius", "calc(0.5em + 10px) 40%", "30px 40%");
+test_computed_value("border-bottom-left-radius", "50% 60px");
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-invalid.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-invalid.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-invalid.html	2019-09-13 05:13:29.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-invalid.html	2019-09-15 11:33:26.000000000 +0000
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>CSS Backgrounds and Borders Module Level 3: parsing border-radius with invalid values</title>
-<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius">
 <meta name="assert" content="border-radius supports only the grammar '<length-percentage>{1,4} [ / <length-percentage>{1,4} ]?'.">
 <script src="/resources/testharness.js"></script>
@@ -12,12 +11,14 @@
 </head>
 <body>
 <script>
+test_invalid_value("border-radius", "auto");
 test_invalid_value("border-radius", "none");
 test_invalid_value("border-radius", "1px 2px 3px 4px 5px");
 test_invalid_value("border-radius", "-1px");
 test_invalid_value("border-radius", "1px -2px");
 test_invalid_value("border-radius", "1em /");
 test_invalid_value("border-radius", "1px / 2px / 3px");
+test_invalid_value("border-radius", "4 / 5");
 
 test_invalid_value("border-radius", "5em 1px 5em 2% 5em 3px 5em 4%");
 test_invalid_value("border-radius", "1px 5em 2% 5em 3px 5em 4% 5em");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-valid.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-valid.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-valid.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-backgrounds/parsing/border-radius-valid.html	2019-09-15 11:33:25.000000000 +0000
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>CSS Backgrounds and Borders Module Level 3: parsing border-radius with valid values</title>
-<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius">
 <meta name="assert" content="border-radius supports the full grammar '<length-percentage>{1,4} [ / <length-percentage>{1,4} ]?'.">
 <script src="/resources/testharness.js"></script>
@@ -14,8 +13,14 @@
 <script>
 test_valid_value("border-radius", "1px");
 test_valid_value("border-radius", "1px 2% 3px 4%");
-test_valid_value("border-radius", "5em / 1px 2% 3px 4%"); // Blink and Webkit fail by serializing as "5em 1px 5em 2% 5em 3px 5em 4%"
-test_valid_value("border-radius", "1px 2% 3px 4% / 5em"); // Blink and Webkit fail by serializing as "1px 5em 2% 5em 3px 5em 4% 5em"
+test_valid_value("border-radius", "5em / 1px 2% 3px 4%");
+test_valid_value("border-radius", "1px 2% 3px 4% / 5em");
+
+test_valid_value("border-radius", "1px 1px 1px 2% / 1px 2% 1px 2%", "1px 1px 1px 2% / 1px 2%");
+test_valid_value("border-radius", "1px 1px 1px 1px / 1px 1px 2% 1px", "1px / 1px 1px 2%");
+test_valid_value("border-radius", "1px 1px 2% 2%");
+test_valid_value("border-radius", "1px 2% 1px 1px");
+test_valid_value("border-radius", "1px 2% 2% 2% / 1px 2% 3px 2%", "1px 2% 2% / 1px 2% 3px");
 
 test_valid_value("border-top-left-radius", "10px");
 test_valid_value("border-top-right-radius", "20%");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-conditional/at-supports-043.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-conditional/at-supports-043.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-conditional/at-supports-043.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-conditional/at-supports-043.html	2019-09-15 11:33:25.000000000 +0000
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+
+        <title>CSS Conditional Test: Disjunction token `or` should not immediately precede its following opening paren.</title>
+
+        <link rel="author" title="Fabien Basmaison" href="https://arkhi.org/">
+        <link rel="help" href="https://www.w3.org/TR/css3-conditional/#at-supports">
+        <link rel="match" href="at-supports-001-ref.html">
+
+        <meta name="flags" content="invalid">
+        <meta name="assert" content="This tests that the `or` token requires at least one whitespace on its right hand. A string followed immediately by an opening paren is reserved for the functional notation syntax.">
+
+        <style>
+            div {
+                background-color: green;
+                height: 100px;
+                width: 100px;
+            }
+
+            @supports ( ( background-color: red ) or( background-color: green ) ) {
+                div { background-color: red; }
+            }
+        </style>
+    </head>
+
+    <body>
+        <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+        <div></div>
+    </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-conditional/META.yml firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-conditional/META.yml
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-conditional/META.yml	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-conditional/META.yml	2019-09-15 11:33:25.000000000 +0000
@@ -1,4 +1,5 @@
 spec: https://drafts.csswg.org/css-conditional/
 suggested_reviewers:
+  - arkhi
   - dbaron
-  - frivoal
+  - frivoal
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-flexbox/flex-minimum-height-flex-items-017.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-flexbox/flex-minimum-height-flex-items-017.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-flexbox/flex-minimum-height-flex-items-017.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-flexbox/flex-minimum-height-flex-items-017.html	2019-09-15 11:33:25.000000000 +0000
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<title>CSS Flexbox: min-height: auto with flex items containing percentage-sized children</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/" />
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#min-size-auto" />
+<link rel="issue" href="https://bugs.chromium.org/p/chromium/issues/detail?id=998080" />
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht" />
+
+<style>
+.flexbox {
+  display: flex;
+  width: 100px;
+  height: 0;
+  flex-direction: column;
+}
+.item {
+  /* Because flex-basis is 0, we rely on min-height to size this item.
+   * We give it an explicit height so that percentages have a chance of
+   * resolving. We can't use 0 for the height because the min-height is
+   * basically min(height, min-content).  */
+  flex: 0 1 0px;
+  height: 100px;
+  background: green;
+}
+.percentage {
+  height: 100%;
+}
+.fixed {
+  height: 100px;
+}
+
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div class="flexbox">
+    <div class="item">
+        <div class="percentage">
+          <div class="fixed"></div>
+        </div>
+    </div>
+</div>
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-flexbox/flex-minimum-height-flex-items-018.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-flexbox/flex-minimum-height-flex-items-018.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-flexbox/flex-minimum-height-flex-items-018.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-flexbox/flex-minimum-height-flex-items-018.html	2019-09-15 11:33:25.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<title>CSS Flexbox: min-height: auto with flex items containing percentage-sized children</title>
+<link rel="author" title="Google LLC" href="https://www.google.com/" />
+<link rel="help" href="https://drafts.csswg.org/css-flexbox/#min-size-auto" />
+<link rel="issue" href="https://bugs.chromium.org/p/chromium/issues/detail?id=998080" />
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht" />
+
+<style>
+.flexbox {
+  display: flex;
+  width: 100px;
+  height: 0;
+  flex-direction: column;
+}
+.item {
+  /* Because the flexbox has height:0, this would flex-shrink to 0. So we rely
+   * on min-height: auto to get a nonzero height.  */
+  height: 100px;
+  background: green;
+}
+.percentage {
+  height: 100%;
+}
+.fixed {
+  height: 100px;
+}
+
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+
+<div class="flexbox">
+    <div class="item">
+        <div class="percentage">
+          <div class="fixed"></div>
+        </div>
+    </div>
+</div>
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-fonts/font-family-name-025.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-fonts/font-family-name-025.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-fonts/font-family-name-025.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-fonts/font-family-name-025.html	2019-09-15 11:33:26.000000000 +0000
@@ -5,6 +5,7 @@
 <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#font-family-prop" />
 <link rel="match" href="font-family-name-025-ref.html" />
 <meta name="assert" content="The 'font-family' property set to and installed font renders the appropriate font. Postscript name should not match." />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 body { font-size: 36px; }
 span#verify { font-family: CSSTest Verify; }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-fonts/font-family-name-025-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-fonts/font-family-name-025-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-fonts/font-family-name-025-ref.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-fonts/font-family-name-025-ref.html	2019-09-15 11:33:25.000000000 +0000
@@ -3,6 +3,7 @@
 <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#propdef-font-family" />
 <link rel="help" href="http://www.w3.org/TR/CSS21/fonts.html#font-family-prop" />
 <meta name="assert" content="The 'font-family' property set to and installed font renders the appropriate font." />
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style type="text/css">
 body { font-size: 36px; }
 span#verify { font-family: CSSTest Verify; }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-fonts/parsing/font-computed.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-fonts/parsing/font-computed.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-fonts/parsing/font-computed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-fonts/parsing/font-computed.html	2019-09-15 11:33:25.000000000 +0000
@@ -0,0 +1,261 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: getComputedStyle().font</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-prop">
+<meta name="assert" content="font computed value round-trips.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #container {
+    font-weight: 800;
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+'use strict';
+
+const initial_style = 'normal';
+const initial_variant = 'normal';
+const initial_weight = 'normal';
+const initial_stretch = 'normal';
+const initial_line_height = 'normal';
+
+// Firefox and Edge 18 serialize these as supplied.
+// Blink and Safari have implementation-dependent or platform-dependent serializations.
+function test_system_font(keyword) {
+  test(() => {
+    const target = document.getElementById('target');
+    const previousValue = 'italic xx-large/0px fantasy';
+    target.style.font = previousValue;
+    target.style.font = keyword;
+    const readValue = getComputedStyle(target).font;
+    assert_not_equals(readValue, '', 'font should be set');
+    assert_not_equals(readValue, previousValue, 'font should be updated');
+    target.style.font = previousValue;
+    target.style.font = readValue;
+    assert_equals(getComputedStyle(target).font, readValue, "serialization should round-trip");
+  }, keyword + ' should be a supported system font.');
+}
+
+test_system_font('caption');
+test_system_font('icon');
+test_system_font('menu');
+test_system_font('message-box');
+test_system_font('small-caption');
+test_system_font('status-bar');
+
+// a value other than normal
+const generate_style = () => 'italic';
+
+// value other than normal
+const generate_variant = () => 'small-caps';
+
+// values other than normal
+const generate_weight = (() => {
+  const alternatives = [
+    'bold',
+    'bolder',
+    'lighter',
+    '100',
+    '900'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const compute_weight = (() => {
+  const cache = {}
+  return (weight) => {
+    if (!(weight in cache)) {
+      const weight_reference = document.createElement('div');
+      document.getElementById('container').appendChild(weight_reference);
+      weight_reference.style.fontWeight = weight;
+      cache[weight] = getComputedStyle(weight_reference).fontWeight;
+      weight_reference.remove();
+    }
+    return cache[weight];
+  }
+})();
+
+// values other than normal
+const generate_stretch = (() => {
+  const alternatives = [
+    'ultra-condensed',
+    'extra-condensed',
+    'condensed',
+    'semi-condensed',
+    'semi-expanded',
+    'expanded',
+    'extra-expanded',
+    'ultra-expanded'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const generate_size = (() => {
+  const alternatives = [
+    // <absolute-size>
+    'xx-small',
+    'medium',
+    'xx-large',
+
+    // <relative-size>
+    'larger',
+    'smaller',
+
+    // <length-percentage>
+    '10px',
+    '20%',
+    'calc(30% - 40px)',
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const generate_line_height = (() => {
+  const alternatives = [
+    null,
+    'normal',
+    '1.2',
+    'calc(120% + 1.2em)'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const generate_family = (() => {
+  const alternatives = [
+    'serif',
+    'sans-serif',
+    'cursive',
+    'fantasy',
+    'monospace',
+    'Menu',
+    '"Non-Generic Example Family Name"'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+function test_specific(prefix) {
+  const reference = document.createElement('div');
+  document.getElementById('container').appendChild(reference);
+
+  let parts = [];
+  let canonical = [];
+  let style = null;
+  let variant = null;
+  let weight = null;
+  let stretch = null;
+  for (let entry of prefix) {
+    if (entry === 'style') {
+      style = generate_style();
+      parts.push(style);
+    } else if (entry === 'variant') {
+      variant = generate_variant();
+      parts.push(variant);
+    } else if (entry === 'weight') {
+      weight = generate_weight();
+      parts.push(weight);
+    } else if (entry === 'stretch') {
+      stretch = generate_stretch();
+      parts.push(stretch);
+    } else {
+      // normal
+      parts.push('normal');
+    }
+  }
+
+  if (style) {
+    canonical.push(style);
+    reference.style.fontStyle = style;
+  } else {
+    canonical.push(initial_style);
+  }
+
+  if (variant) {
+    canonical.push(variant);
+    reference.style.fontVariant = style;
+  } else {
+    canonical.push(initial_variant);
+  }
+  if (weight) {
+    canonical.push(compute_weight(weight));
+    reference.style.fontWeight = style;
+  } else {
+    canonical.push(compute_weight(initial_weight));
+  }
+  if (stretch) {
+    canonical.push(stretch);
+    reference.style.fontStretch = style;
+  } else {
+    canonical.push(initial_stretch);
+  }
+
+  const size = generate_size();
+  reference.style.fontSize = size;
+  const line_height = generate_line_height();
+  if (line_height) {
+    parts.push(size + '/' + line_height);
+    reference.style.lineHeight = line_height;
+  } else {
+    parts.push(size);
+  }
+
+  const family = generate_family();
+  parts.push(family);
+  reference.style.fontFamily = family;
+
+  canonical.push(getComputedStyle(reference).fontSize + '/' + getComputedStyle(reference).lineHeight);
+  canonical.push(family);
+
+  reference.remove();
+
+  // Implementations differ on adjacent space when serializing '/'
+  // https://github.com/w3c/csswg-drafts/issues/4282
+  const expected = canonical.join(' ');
+  test_computed_value('font', parts.join(' '), [expected, expected.replace('/', ' / ')]);
+}
+
+// Font style, variant, weight and stretch may appear in any order.
+// Any or all may be omitted. Each accepts the keyword 'normal'.
+// We generate every permutation of these four properties, treating
+// the cases of a property value being omitted or being explicitly
+// 'normal' as being distinct permutations from when the property
+// has a value other than 'normal'.
+function test_various(prefix) {
+  test_specific(prefix);
+  if (prefix.length === 4) {
+    // Font style, variant, weight and stretch may not appear
+    // more than once.
+    return;
+  }
+
+  const alternatives = [
+    'normal',
+    'style',
+    'variant',
+    'weight',
+    'stretch'
+  ];
+  for (let alternative of alternatives) {
+    // Since this is called recursively, check prefix for existing
+    // alternatives, otherwise we may have two styles or two variants, etc.
+    if (alternative === 'normal' || !prefix.includes(alternative))
+      test_various(prefix.concat(alternative));
+  }
+}
+
+test_various([]);
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-fonts/parsing/font-style-computed.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-fonts/parsing/font-style-computed.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-fonts/parsing/font-style-computed.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-fonts/parsing/font-style-computed.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/css/support/computed-testcommon.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   #target {
     font-family: Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-005.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-005.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-005.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-005.html	2019-09-15 11:33:27.000000000 +0000
@@ -4,6 +4,7 @@
 <link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
 <link rel="help" title="10.2 Aligning with auto margins" href="https://drafts.csswg.org/css-grid/#auto-margins">
 <meta name="assert" content="The 'top' and 'bottom' margins must be recomputed whenever the grid item's height changes.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   #grid {
       display: grid;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-006.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-006.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-006.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-006.html	2019-09-15 11:33:25.000000000 +0000
@@ -4,6 +4,7 @@
 <link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
 <link rel="help" title="10.2 Aligning with auto margins" href="https://drafts.csswg.org/css-grid/#auto-margins">
 <meta name="assert" content="The 'top' and 'bottom' margins must be recomputed whenever the grid item's height changes.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   #grid {
       display: grid;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-block-axis-alignment-auto-margins-008.html	2019-09-15 11:33:26.000000000 +0000
@@ -5,6 +5,7 @@
 <link rel="help" title="10.2 Aligning with auto margins" href="https://drafts.csswg.org/css-grid/#auto-margins">
 <link rel="match" href="../reference/grid-block-axis-alignment-auto-margins-008-ref.html">
 <meta name="assert" content="The 'top' and 'bottom' margins must be recomputed after the grid's intrinsic size is determined.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   #grid {
       display: grid;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html	2019-09-15 11:33:25.000000000 +0000
@@ -4,6 +4,7 @@
 <link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
 <link rel="help" title="10.2 Aligning with auto margins" href="https://drafts.csswg.org/css-grid/#auto-margins">
 <meta name="assert" content="The 'left' and 'right' margins must be recomputed whenever the grid items's width changes.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   #grid {
       display: grid;
@@ -35,13 +36,17 @@
     <div id="item2">XXXXX</div>
 </div>
 <script>
+document.fonts.ready.then(() => {
     item1.setAttribute("data-offset-x", "50");
     item2.setAttribute("data-offset-x", "325");
-    checkLayout('#grid');
+    checkLayout('#grid', false);
 
     item2.style.fontSize = "30px";
 
     item1.setAttribute("data-offset-x", "50");
     item2.setAttribute("data-offset-x", "275");
-    checkLayout('#grid');
+    checkLayout('#grid', false);
+
+    done();
+});
 </script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html	2019-09-15 11:33:25.000000000 +0000
@@ -4,6 +4,7 @@
 <link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
 <link rel="help" title="10.2 Aligning with auto margins" href="https://drafts.csswg.org/css-grid/#auto-margins">
 <meta name="assert" content="The 'left' and 'right' margins must be recomputed whenever the grid items's width changes.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   #grid {
       display: grid;
@@ -34,13 +35,17 @@
     <div id="item2">XX</div>
 </div>
 <script>
+document.fonts.ready.then(() => {
     item1.setAttribute("data-offset-x", "80");
     item2.setAttribute("data-offset-x", "340");
-    checkLayout('#grid');
+    checkLayout('#grid', false);
 
     grid.style.fontSize = "25px";
 
     item1.setAttribute("data-offset-x", "50");
     item2.setAttribute("data-offset-x", "325");
-    checkLayout('#grid');
+    checkLayout('#grid', false);
+
+    done();
+});
 </script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-008.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-008.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-008.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-008.html	2019-09-15 11:33:25.000000000 +0000
@@ -5,6 +5,7 @@
 <link rel="help" title="10.2 Aligning with auto margins" href="https://drafts.csswg.org/css-grid/#auto-margins">
 <link rel="match" href="../reference/grid-inline-axis-alignment-auto-margins-008-ref.html">
 <meta name="assert" content="The 'left' and 'right' margins must be recomputed after the grid's intrinsic size is determined.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   #grid {
       display: grid;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/grid-definition/grid-auto-repeat-max-size-001.html	2019-09-15 11:33:25.000000000 +0000
@@ -25,6 +25,14 @@
   grid-column: -2;
   grid-row: -2;
 }
+.pad-calc {
+ border-width: 0;
+ padding: calc(10% + 20px);
+}
+.pad-percent {
+ border-width: 0;
+ padding: 10%;
+}
 </style>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -69,16 +77,64 @@
   <div class="item" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
 </div>
 
+<div style="width:min-content" data-expected-width="300" data-expected-height="160">
+  <div class="grid border border-box pad-percent" data-expected-width="300" data-expected-height="160">
+    <div class="item" data-offset-x="130" data-offset-y="80" data-expected-width="100" data-expected-height="50">x</div>
+  </div>
+</div>
+
+<div style="width:min-content" data-expected-width="240" data-expected-height="188">
+  <div class="grid border border-box pad-calc" data-expected-width="240" data-expected-height="188">
+    <div class="item" data-offset-x="44" data-offset-y="94" data-expected-width="100" data-expected-height="50"></div>
+  </div>
+</div>
+
 <div class="grid border border-box" style="width: 200px; height: 100px;" data-expected-width="200" data-expected-height="100">
   <div class="item" data-offset-x="0" data-offset-y="0" data-expected-width="100" data-expected-height="50"></div>
 </div>
 
+<div style="width:min-content" data-expected-width="200" data-expected-height="100">
+  <div class="grid border border-box pad-percent" style="width: 200px; height: 100px;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-offset-x="20" data-offset-y="20" data-expected-width="100" data-expected-height="50"></div>
+  </div>
+</div>
+
+<div style="width:min-content" data-expected-width="200" data-expected-height="100">
+  <div class="grid border border-box pad-calc" style="width: 200px; height: 100px;" data-expected-width="200" data-expected-height="100">
+    <div class="item" data-offset-x="40" data-offset-y="40" data-expected-width="100" data-expected-height="50"></div>
+  </div>
+</div>
+
 <div class="grid border border-box" style="width: min-content; height: min-content;" data-expected-width="220" data-expected-height="170">
   <div class="item" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
 </div>
 
+<div style="width:min-content" data-expected-width="300" data-expected-height="160">
+  <div class="grid border border-box pad-percent" style="width: min-content; height: min-content;" data-expected-width="300" data-expected-height="160">
+    <div class="item" data-offset-x="130" data-offset-y="80" data-expected-width="100" data-expected-height="50"></div>
+  </div>
+</div>
+
+<div style="width:min-content" data-expected-width="240" data-expected-height="188">
+  <div class="grid border border-box pad-calc" style="width: min-content; height: min-content;" data-expected-width="288" data-expected-height="188">
+    <div class="item" data-offset-x="144" data-offset-y="94" data-expected-width="100" data-expected-height="50"></div>
+  </div>
+</div>
+
 <div class="grid border border-box" style="width: max-content; height: max-content;" data-expected-width="220" data-expected-height="170">
   <div class="item" data-offset-x="100" data-offset-y="100" data-expected-width="100" data-expected-height="50"></div>
 </div>
 
+<div style="width:min-content" data-expected-width="300" data-expected-height="160">
+  <div class="grid border border-box pad-percent" style="width: max-content; height: max-content;" data-expected-width="300" data-expected-height="160">
+    <div class="item" data-offset-x="130" data-offset-y="80" data-expected-width="100" data-expected-height="50"></div>
+  </div>
+</div>
+
+<div style="width:min-content" data-expected-width="240" data-expected-height="188">
+  <div class="grid border border-box pad-calc" style="width: max-content; height: max-content;" data-expected-width="288" data-expected-height="188">
+    <div class="item" data-offset-x="144" data-offset-y="94" data-expected-width="100" data-expected-height="50"></div>
+  </div>
+</div>
+
 </body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/reference/grid-block-axis-alignment-auto-margins-008-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/reference/grid-block-axis-alignment-auto-margins-008-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/reference/grid-block-axis-alignment-auto-margins-008-ref.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/reference/grid-block-axis-alignment-auto-margins-008-ref.html	2019-09-15 11:33:25.000000000 +0000
@@ -2,6 +2,7 @@
 <meta charset="utf-8">
 <title>CSS Grid Layout Reference: Aligning grid items using 'auto' margins</title>
 <link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   #grid {
       display: grid;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/reference/grid-inline-axis-alignment-auto-margins-008-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/reference/grid-inline-axis-alignment-auto-margins-008-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-grid/reference/grid-inline-axis-alignment-auto-margins-008-ref.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-grid/reference/grid-inline-axis-alignment-auto-margins-008-ref.html	2019-09-15 11:33:25.000000000 +0000
@@ -2,6 +2,7 @@
 <meta charset="utf-8">
 <title>CSS Grid Layout Reference: Aligning grid items using 'auto' margins</title>
 <link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   #grid {
       display: grid;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-lists/inherit-overwrites.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-lists/inherit-overwrites.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-lists/inherit-overwrites.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-lists/inherit-overwrites.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Inheritance replaces existing value of counter properties</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#property-index">
+<meta name="assert" content="Inheritance replaces existing value of counter properties.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #container {
+    counter-reset: first 1;
+    counter-increment: second 2;
+    counter-set: third 3;
+  }
+  .target {
+    counter-reset: fourth 4;
+    counter-increment: fifth 5;
+    counter-set: sixth 6;
+  }
+</style>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+'use strict';
+const container = document.getElementById('container');
+
+// 'counter-set' can be added.
+for (let property of ['counter-reset', 'counter-increment']) {
+  test(() => {
+    const target = document.createElement('div');
+    target.classList += 'target';
+    container.appendChild(target);
+    target.style[property] = 'inherit';
+    assert_equals(getComputedStyle(target)[property], getComputedStyle(container)[property]);
+  }, 'Inheritance of ' + property + ' replaces existing value');
+}
+
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-001.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-001.html	2019-09-15 11:33:26.000000000 +0000
@@ -4,6 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path" title="5.1 Clipping Shape: the clip-path property">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
 <meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   body {
     overflow: hidden;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-002.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-002.html	2019-09-15 11:33:25.000000000 +0000
@@ -4,6 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path" title="5.1 Clipping Shape: the clip-path property">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
 <meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   body {
     overflow: hidden;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-003.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-003.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-003.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-masking/clip-path/clip-path-inline-003.html	2019-09-15 11:33:25.000000000 +0000
@@ -4,6 +4,7 @@
 <link rel="help" href="https://www.w3.org/TR/css-masking-1/#the-clip-path" title="5.1 Clipping Shape: the clip-path property">
 <link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
 <meta content="ahem" name="flags">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
   body {
     overflow: hidden;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/cssom/CSSStyleSheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/cssom/CSSStyleSheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/cssom/CSSStyleSheet.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/cssom/CSSStyleSheet.html	2019-09-15 11:33:26.000000000 +0000
@@ -4,25 +4,37 @@
     <meta charset="utf-8">
     <title>CSSOM - CSSStyleSheet interface</title>
     <link rel="help" href="https://drafts.csswg.org/cssom/#the-cssstylesheet-interface">
+    <link rel="help" href="https://drafts.csswg.org/cssom/#legacy-css-style-sheet-members">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style id="my-stylesheet">
         body { width: 50%; }
         #foo { height: 100px; }
     </style>
+    <style id="empty-stylesheet"></style>
 
     <script>
-    test(function () {
-        var styleSheet = document.styleSheets[0];
+    var styleSheet, emptyStyleSheet;
+
+    setup(function() {
+        styleSheet = document.styleSheets[0];
         styleSheet.cssRules[0].randomProperty = 1;
         styleSheet.cssRules[1].randomProperty = 2;
+        emptyStyleSheet = document.styleSheets[1];
+    });
 
+    test(function() {
         assert_equals(styleSheet, document.getElementById("my-stylesheet").sheet, "CSSStyleSheet and LinkStyle's sheet attribute");
         assert_equals(styleSheet.cssRules.length, 2, "CSSStyleSheet cssRules attribute");
         assert_equals(styleSheet.cssRules[0].cssText, "body { width: 50%; }", "CSSStyleSheet cssRules attribute");
         assert_equals(styleSheet.cssRules[1].cssText, "#foo { height: 100px; }", "CSSStyleSheet cssRules attribute");
         assert_equals(styleSheet.cssRules[2], undefined, "CSSStyleSheet cssRules attribute");
 
+        assert_equals(emptyStyleSheet, document.getElementById("empty-stylesheet").sheet, "CSSStyleSheet and LinkStyle's sheet attribute");
+        assert_equals(emptyStyleSheet.cssRules.length, 0, "CSSStyleSheet cssRules attribute");
+    }, "preconditions");
+
+    test(function() {
         styleSheet.insertRule("#bar { margin: 10px; }", 1);
         assert_equals(styleSheet.cssRules.length, 3, "CSSStyleSheet cssRules attribute after insertRule function");
         assert_equals(styleSheet.cssRules[0].cssText, "body { width: 50%; }", "CSSStyleSheet cssRules attribute");
@@ -30,7 +42,19 @@
         assert_equals(styleSheet.cssRules[2].cssText, "#foo { height: 100px; }", "CSSStyleSheet cssRules attribute after insertRule function");
         assert_equals(styleSheet.cssRules[0].randomProperty, 1, "[SameObject] cssRules attribute after insertRule function");
         assert_equals(styleSheet.cssRules[2].randomProperty, 2, "[SameObject] cssRules attribute after insertRule function");
+    }, 'insertRule with #bar selector');
+
+    test(function() {
+        assert_throws(new TypeError, function() { styleSheet.insertRule() });
+    }, 'insertRule with no argument throws');
+
+    test(function() {
+        assert_throws("IndexSizeError", function() {
+            styleSheet.insertRule("#bar { margin: 10px; }", styleSheet.cssRules.length + 1)
+        });
+    }, 'insertRule with index greater than length throws');
 
+    test(function() {
         styleSheet.deleteRule(1);
         assert_equals(styleSheet.cssRules.length, 2, "CSSStyleSheet cssRules attribute after deleteRule function");
         assert_equals(styleSheet.cssRules[0].cssText, "body { width: 50%; }", "CSSStyleSheet cssRules attribute after deleteRule function");
@@ -38,19 +62,39 @@
         assert_equals(styleSheet.cssRules[2], undefined, "CSSStyleSheet cssRules attribute after deleteRule function");
         assert_equals(styleSheet.cssRules[0].randomProperty, 1, "[SameObject] cssRules attribute after deleteRule function");
         assert_equals(styleSheet.cssRules[1].randomProperty, 2, "[SameObject] cssRules attribute after deleteRule function");
+    }, 'deleteRule(1)');
 
+    test(function() {
+        assert_throws(new TypeError, function() { styleSheet.deleteRule() });
+    }, 'deleteRule with no argument throws');
+
+    test(function() {
+        assert_throws("IndexSizeError", function() { emptyStyleSheet.deleteRule(0) });
+    }, 'deleteRule on empty style sheet throws');
+
+    test(function() {
         styleSheet.removeRule();
         assert_equals(styleSheet.cssRules.length, 1, "CSSStyleSheet cssRules attribute after removeRule function");
         assert_equals(styleSheet.cssRules[0].cssText, "#foo { height: 100px; }", "CSSStyleSheet cssRules attribute after removeRule function");
+    }, 'removeRule with no argument removes first rule');
 
+    test(function() {
+        assert_throws("IndexSizeError", function() { emptyStyleSheet.removeRule(0) });
+    }, 'removeRule on empty style sheet throws');
+
+    test(function() {
         assert_equals(styleSheet.addRule("@media all", "#foo { color: red }"), -1);
         assert_equals(styleSheet.cssRules.length, 2, "CSSStyleSheet cssRules attribute after addRule function");
         assert_true(styleSheet.cssRules[1] instanceof CSSMediaRule, "CSSStyleSheet addRule does some silly string concatenation");
+    }, 'addRule with @media rule');
 
+    test(function() {
         styleSheet.removeRule(1);
         assert_equals(styleSheet.cssRules.length, 1, "CSSStyleSheet cssRules attribute after removeRule function with index");
         assert_equals(styleSheet.cssRules[0].cssText, "#foo { height: 100px; }", "CSSStyleSheet cssRules attribute after deleteRule function with index");
+    }, 'removeRule(1)');
 
+    test(function() {
         assert_equals(styleSheet.addRule("#foo", "color: red"), -1);
         assert_equals(styleSheet.cssRules.length, 2, "CSSStyleSheet cssRules attribute after addRule function with simple selector");
         assert_equals(styleSheet.cssRules[1].cssText, "#foo { color: red; }", "CSSStyleSheet cssRules attribute after addRule function without index appends to the end");
@@ -58,13 +102,31 @@
         assert_equals(styleSheet.addRule("#foo", "color: blue", 0), -1);
         assert_equals(styleSheet.cssRules.length, 3, "CSSStyleSheet cssRules attribute after addRule function with simple selector with index");
         assert_equals(styleSheet.cssRules[0].cssText, "#foo { color: blue; }", "addRule function with index performs an insertion");
+    }, 'addRule with #foo selectors');
 
+    test(function() {
         assert_equals(styleSheet.addRule(), -1);
         assert_equals(styleSheet.cssRules.length, 4, "CSSStyleSheet cssRules attribute after addRule function without arguments");
         assert_equals(styleSheet.cssRules[3].cssText, "undefined { }", "addRule arguments default to undefined");
+    }, 'addRule with no argument adds "undefined" selector');
 
-        assert_equals(styleSheet.cssRules, styleSheet.rules, "CSSStyleSheet.rules returns the same object as CSSStyleSheet.cssRules");
-    });
+    test(function() {
+        assert_throws("IndexSizeError", function() {
+            styleSheet.addRule("#foo", "color: red", styleSheet.cssRules.length + 1);
+        });
+    }, 'addRule with index greater than length throws');
+
+    test(function() {
+        assert_equals(styleSheet.cssRules, styleSheet.rules);
+    }, "cssRules and rules are the same object");
+
+    test(function() {
+        assert_equals(styleSheet.cssRules, styleSheet.cssRules);
+    }, "cssRules returns the same object twice");
+
+    test(function() {
+        assert_equals(styleSheet.rules, styleSheet.rules);
+    }, "rules returns the same object twice");
     </script>
 </head>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/cssom-view/getBoundingClientRect-empty-inline.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/cssom-view/getBoundingClientRect-empty-inline.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/cssom-view/getBoundingClientRect-empty-inline.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/cssom-view/getBoundingClientRect-empty-inline.html	2019-09-15 11:33:26.000000000 +0000
@@ -3,6 +3,7 @@
 <link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 10px/1 Ahem;
@@ -18,6 +19,7 @@
     <span class="inline-block"></span>
   </div>
 <script>
+document.fonts.ready.then(() => {
 run(document.getElementById('empty'));
 function run(element) {
   test(() => {
@@ -28,5 +30,6 @@
     assert_equals(rect.height, 10, "height");
   });
 }
+});
 </script>
 </body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/cssom-view/offsetTopLeft-border-box.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/cssom-view/offsetTopLeft-border-box.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/cssom-view/offsetTopLeft-border-box.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/cssom-view/offsetTopLeft-border-box.html	2019-09-15 11:33:25.000000000 +0000
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#extensions-to-the-htmlelement-interface">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<style>
+@font-face { font-family: 'Ahem'; src: local('Ahem') url('/fonts/Ahem.ttf'); }
+
+.container {
+  position: relative;
+  font: 20px/1 Ahem;
+  width: 150px;
+  height: 100px;
+  padding: 2px 10px;
+  border-width: 3px 6px;
+  border-style: solid;
+  box-sizing: border-box;
+}
+
+.target { background: grey; }
+.hl { writing-mode:horizontal-tb; }
+.vlr { writing-mode:vertical-lr; }
+</style>
+<div id=tests>
+<div class="container hl">
+  <span class="target">x</span>
+</div>
+<div class="container vlr">
+  <span class="target">x</span>
+</div>
+<div class="container hl">
+  <div class="target">x</div>
+</div>
+<div class="container vlr">
+  <div class="target">x</div>
+</div>
+</div>
+<script>
+// Clone the above tests for the following 'display' types:
+let display = ['inline-block', 'grid', 'inline-grid', 'flex', 'inline-flex', 'flow-root' ];
+let tests = document.querySelector('#tests');
+display.forEach((display) => {
+  let t = tests.cloneNode(true);
+  [...t.children].forEach((child) => {
+    child.setAttribute("style", "display:"+display);
+  });
+  document.body.appendChild(t);
+});
+// Check that all of them return an offset relative the padding edge.
+var i = 0;
+document.querySelectorAll('.target').forEach((target) => {
+  test(() => {
+    assert_equals(target.offsetLeft, 10, 'offsetLeft');
+    assert_equals(target.offsetTop, 2, 'offsetTop');
+  }, 'container: ' + i);
+  i++;
+});
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-paint-api/non-registered-property-value.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-paint-api/non-registered-property-value.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-paint-api/non-registered-property-value.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-paint-api/non-registered-property-value.https.html	2019-09-15 11:33:25.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://drafts.css-houdini.org/css-paint-api/">
+<link rel="match" href="parse-input-arguments-ref.html">
+<style>
+.container {
+  width: 100px;
+  height: 100px;
+}
+
+#canvas-geometry {
+  --foo:100;
+  background-image: paint(geometry);
+}
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<body>
+<div id="canvas-geometry" class="container"></div>
+
+<script id="code" type="text/worklet">
+registerPaint('geometry', class {
+  static get inputProperties() { return ['--foo']; }
+  paint(ctx, geom, properties) {
+    let fooValue = parseFloat(properties.get('--foo').toString());
+    ctx.strokeStyle = 'green';
+    ctx.lineWidth = 4;
+    ctx.strokeRect(0, 0, fooValue, fooValue);
+  }
+});
+</script>
+
+<script>
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-pseudo/first-letter-width.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-pseudo/first-letter-width.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-pseudo/first-letter-width.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-pseudo/first-letter-width.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<html lang="en">
+<head>
+	<title>initial-letter width test</title>
+	<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=362880">
+	<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#first-letter-styling">
+	<link rel="match" href="first-letter-width-ref.html">
+	<meta name="assert" content="The width of an element with first-letter styling should render correctly.">
+	<style>
+		div {
+			position: relative;
+		}
+		span {
+			position: absolute;
+			color: transparent;
+		}
+		#control {
+			background-color: green;
+		}
+		#test {
+			background-color: red;
+			line-height: 1;
+			top: 1px;
+		}
+		#test::first-letter {
+			text-transform: uppercase;
+		}
+	</style>
+</head>
+<body>
+	<p>There should be no red</p>
+	<div>
+	<span id="test">Test</span>
+	<span id="control">Test.</span>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-pseudo/first-letter-width-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-pseudo/first-letter-width-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-pseudo/first-letter-width-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-pseudo/first-letter-width-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<html lang="en">
+<head>
+	<title>initial-letter width test</title>
+	<style>
+		span {
+			position: absolute;
+			color: transparent;
+		}
+		#control {
+			background-color: green;
+		}
+	</style>
+</head>
+<body>
+	<p>There should be no red</p>
+	<span id="control">Test.</span>
+</body>
+</html>
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-scroll-anchoring/image-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-scroll-anchoring/image-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-scroll-anchoring/image-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-scroll-anchoring/image-001.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Scroll Anchoring: Anchor node can be an image</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/css-scroll-anchoring/#anchor-node-selection">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/4247">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1540203">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+body { height: 4000px }
+#spacer { height: 100px }
+img {
+  width: 500px;
+  height: 500px;
+  background: green;
+}
+</style>
+<div id=spacer></div>
+<br><br>
+<img>
+<script>
+test(() => {
+  document.scrollingElement.scrollTop = 150;
+  document.querySelector("#spacer").style.height = "150px";
+  assert_equals(document.scrollingElement.scrollTop, 200);
+}, "Anchor selection can select images");
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-scroll-anchoring/inline-block-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-scroll-anchoring/inline-block-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-scroll-anchoring/inline-block-002.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-scroll-anchoring/inline-block-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Scroll Anchoring: Anchor node can be an empty inline-block</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" title="Mozilla" href="https://mozilla.org">
+<link rel="help" href="https://drafts.csswg.org/css-scroll-anchoring/#anchor-node-selection">
+<link rel="help" href="https://github.com/w3c/csswg-drafts/issues/4247">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1540203">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+body { height: 4000px }
+#ib1, #ib2 { display: inline-block; height: 100px; width: 100% }
+</style>
+<span id=ib1></span>
+<br><br>
+<span id=ib2></span>
+<script>
+
+// Tests anchoring to an empty inline-block.
+
+test(() => {
+  document.scrollingElement.scrollTop = 150;
+  document.querySelector("#ib1").style.height = "150px";
+  assert_equals(document.scrollingElement.scrollTop, 200);
+}, "Anchor selection can select empty inline-blocks");
+
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/hyphens/hyphens-overflow-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/hyphens/hyphens-overflow-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/hyphens/hyphens-overflow-001.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/hyphens/hyphens-overflow-001.html	2019-09-15 11:33:26.000000000 +0000
@@ -3,6 +3,7 @@
 <link rel="match" href="reference/hyphens-overflow-001-ref.html">
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#hyphens-property">
 <link rel="author" href="mailto:kojii@chromium.org">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font-size: 10px;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/hyphens/reference/hyphens-overflow-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/hyphens/reference/hyphens-overflow-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/hyphens/reference/hyphens-overflow-001-ref.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/hyphens/reference/hyphens-overflow-001-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font-size: 10px;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<title>CSS Text Test: A combination of `overflow-wrap: break-word` and `white-space` should not crash</title>
+<link rel="help" href="https://crbug.com/1001359">
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+.container {
+  font-family: sans-serif;
+  font-size: 14px;
+  width: 680px;
+  word-wrap: break-word;
+}
+
+spacer {
+  display: inline-block;
+  width: 620px;
+}
+
+pre-wrap {
+  white-space: pre-wrap;
+}
+
+nowrap {
+  white-space: nowrap;
+}
+
+inline-block {
+  display: inline-block;
+}
+</style>
+<body>
+  <div class="container">
+    <spacer></spacer>
+    <nowrap><span><pre-wrap><inline-block></inline-block></pre-wrap></span>123456</nowrap>987654321
+</div>
+<script>
+test(() => { });
+</script>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/tab-size/tab-size.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/tab-size/tab-size.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/tab-size/tab-size.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/tab-size/tab-size.html	2019-09-15 11:33:25.000000000 +0000
@@ -2,6 +2,7 @@
 <meta charset="utf-8">
 <title>Test: CSS value type of the CSS property 'tab-size'</title>
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#tab-size-property">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 body {
   font-family: Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-001.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-001.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space at the beginning of the line are breaking opportunities when white-space is pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 50px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-002.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-002.html	2019-09-15 11:33:25.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should be breaking opportunities when white-space is pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 25px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-003.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-003.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-003.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-003.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should be breaking opportunities when white-space is pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 25px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-004.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-004.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-004.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-004.html	2019-09-15 11:33:27.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should not be collapsed, honoring white-space: pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-005.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-005.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-005.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-005.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should not be collapsed, honoring white-space: pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-006.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-006.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-006.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-006.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should not be collapsed, honoring white-space: pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-007.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-007.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-007.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-007.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should not be collapsed, honoring white-space: pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-008.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-008.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-008.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-008.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should not be collapsed, honoring white-space: pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-009.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-009.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-009.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-009.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should not be collapsed, honoring white-space: pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-010.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-010.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-010.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-010.html	2019-09-15 11:33:25.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should not be collapsed, honoring white-space: pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-011.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-011.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-011.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-011.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should not be collapsed, honoring white-space: pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-012.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-012.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-012.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-012.html	2019-09-15 11:33:27.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should be breaking opportunities when white-space is pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 25px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-013.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-013.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-013.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-013.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should be breaking opportunities when white-space is pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 25px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-014.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-014.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-014.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/pre-wrap-leading-spaces-014.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
 <link rel="match" href="reference/white-space-break-spaces-005-ref.html">
 <meta name="assert" content="Preserved white space after forced breaks become leading white-spaces and should be breaking opportunities when white-space is pre-wrap.">
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-004-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-004-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-004-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/reference/white-space-pre-wrap-trailing-spaces-004-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -3,6 +3,7 @@
 <title>CSS test Reference</title>
 <link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com" />
 
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 25px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-005.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-005.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-005.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text/white-space/white-space-pre-wrap-trailing-spaces-005.html	2019-09-15 11:33:25.000000000 +0000
@@ -5,6 +5,7 @@
 <link rel="help" href="https://drafts.csswg.org/css-text-3/#white-space-phase-2">
 <link rel="match" href="reference/white-space-pre-wrap-trailing-spaces-004-ref.html">
 <meta name="assert" content="Preserved white space at the end of the line is hanged when white-space is pre-wrap.">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 div {
   font: 10px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/parsing/text-decoration-computed.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/parsing/text-decoration-computed.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/parsing/text-decoration-computed.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/parsing/text-decoration-computed.html	2019-09-15 11:33:27.000000000 +0000
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>CSS Text Decoration Test: getComputedStyle().textDecoration</title>
-<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-line-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-3/#text-decoration-property">
 <meta name="assert" content="text-decoration computed value is as specified.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -19,14 +19,20 @@
 <script>
 'use strict';
 const currentColor = "rgb(0, 0, 255)";
-test_computed_value("text-decoration", "none", "none solid " + currentColor);
-test_computed_value("text-decoration", "line-through", "line-through solid " + currentColor);
-test_computed_value("text-decoration", "solid", "none solid " + currentColor);
-test_computed_value("text-decoration", "currentcolor", "none solid " + currentColor);
+test_computed_value("text-decoration", "none", currentColor);
+test_computed_value("text-decoration", "line-through", "line-through " + currentColor);
+test_computed_value("text-decoration", "solid", currentColor);
+test_computed_value("text-decoration", "currentcolor", currentColor);
 
 test_computed_value("text-decoration", "double overline underline", "underline overline double " + currentColor);
-test_computed_value("text-decoration", "underline overline line-through red", "underline overline line-through solid rgb(255, 0, 0)");
-test_computed_value("text-decoration", "rgba(10, 20, 30, 0.4) dotted", "none dotted rgba(10, 20, 30, 0.4)");
+test_computed_value("text-decoration", "underline overline line-through red", "underline overline line-through rgb(255, 0, 0)");
+test_computed_value("text-decoration", "rgba(10, 20, 30, 0.4) dotted", "dotted rgba(10, 20, 30, 0.4)");
 
 test_computed_value("text-decoration", "underline dashed rgb(0, 255, 0)");
+
+// Add text-decoration-thickness in [css-text-decor-4].
+test_computed_value("text-decoration", "auto", currentColor);
+test_computed_value("text-decoration", "from-font", currentColor + " from-font");
+test_computed_value("text-decoration", "10px", currentColor + " 10px");
+test_computed_value("text-decoration", "underline red from-font", "underline rgb(255, 0, 0) from-font");
 </script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-001-notref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-001-notref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-001-notref.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-001-notref.html	2019-09-15 11:33:26.000000000 +0000
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Non-reference case for text-underline-offset</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         #main {
             margin: 2em;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-002-ref.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-002-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Reference case for text-underline-offset</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         #main{
             border-bottom: 1px solid cyan;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-notref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-notref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-notref.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-notref.html	2019-09-15 11:33:26.000000000 +0000
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Non-reference case for text-underline-offset</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         #text{
             border: black dashed;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-ref.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-scroll-001-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Reference case for text-underline-offset</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         #text{
             border: black dashed;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-vertical-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-vertical-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-vertical-001-ref.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-vertical-001-ref.html	2019-09-15 11:33:25.000000000 +0000
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Reference case for text-underline-offset</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         span{
             font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-vertical-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-vertical-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-vertical-002-ref.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/reference/text-underline-offset-vertical-002-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -3,6 +3,7 @@
 <head>
     <meta charset="utf-8">
     <title>Reference case for text-underline-offset</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         div{
             font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-decoration-serialization.tentative.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-decoration-serialization.tentative.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-decoration-serialization.tentative.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-decoration-serialization.tentative.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,10 +8,11 @@
 <script>
 test(() => {
   const style = getComputedStyle(document.querySelector('div'));
-  // Chrome serializes as "underline solid rgb(0, 0, 0)" while Edge, Firefox an
-  // Safari use "underline", which Chrome used to do as well. The spec should
-  // probably require "underline":
-  // https://github.com/w3c/csswg-drafts/issues/1564
-  assert_equals(style.getPropertyValue("text-decoration"), "underline");
+  const currentColor = "rgb(0, 0, 0)"; // The default color value is black.
+  // The default computed value of text-decoration-color is depended on the
+  // current color value, and it is an rgb() value, instead of `currentcolor`.
+  // This is an ambiguous part in the spec, anyway.
+  assert_equals(style.getPropertyValue("text-decoration"),
+                "underline " + currentColor);
 });
 </script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-underline-offset-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-underline-offset-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-underline-offset-001.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-underline-offset-001.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#underline-offset">
     <link rel="mismatch" href="reference/text-underline-offset-001-notref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         #main {
             margin: 2em;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-underline-offset-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-underline-offset-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-underline-offset-002.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-underline-offset-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -7,6 +7,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#underline-offset">
     <link rel="match" href="reference/text-underline-offset-002-ref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         #main{
             border-bottom: 1px solid cyan;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-underline-offset-scroll-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-underline-offset-scroll-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-underline-offset-scroll-001.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-underline-offset-scroll-001.html	2019-09-15 11:33:27.000000000 +0000
@@ -9,6 +9,7 @@
     <link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#underline-offset">
     <link rel="match" href="reference/text-underline-offset-scroll-001-ref.html">
     <link rel="mismatch" href="reference/text-underline-offset-scroll-001-notref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         /*
          * Testing to make sure that positioning the underline
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-underline-offset-vertical-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-underline-offset-vertical-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-underline-offset-vertical-001.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-underline-offset-vertical-001.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#underline-offset">
     <link rel="match" href="reference/text-underline-offset-vertical-001-ref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         span{
             margin-left: 5em;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-underline-offset-vertical-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-underline-offset-vertical-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-text-decor/text-underline-offset-vertical-002.html	2019-09-13 05:13:30.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-text-decor/text-underline-offset-vertical-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -8,6 +8,7 @@
     <link rel="author" title="Mozilla" href="https://www.mozilla.org">
     <link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#underline-offset">
     <link rel="match" href="reference/text-underline-offset-vertical-002-ref.html">
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
         div{
             font: 20px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-ui/text-overflow-016.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-ui/text-overflow-016.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-ui/text-overflow-016.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-ui/text-overflow-016.html	2019-09-15 11:33:26.000000000 +0000
@@ -6,6 +6,7 @@
 <link rel="match" href="reference/text-overflow-016-ref.html">
 <meta name="flags" content="ahem">
 <meta name="assert" content="If there is insufficient space for the ellipsis, then clip the rendering of the ellipsis itself">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 .test, .test2 {
   overflow: hidden;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-variables/variable-presentation-attribute.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-variables/variable-presentation-attribute.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/css-variables/variable-presentation-attribute.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/css-variables/variable-presentation-attribute.html	2019-09-15 11:33:27.000000000 +0000
@@ -91,7 +91,8 @@
             { property: "stroke-opacity", valuesToTest:["0.221"], default: "1" },
             { property: "stroke-width", valuesToTest:["88%", "31px"], default: "1px" },
             { property: "text-anchor", valuesToTest:["start", "middle", "end"], default: "start" },
-            { property: "text-decoration", valuesToTest:["none", "underline", "overline", "line-through"], default: "none" },
+            { property: "text-decoration-line", valuesToTest:["none", "underline", "overline", "line-through"], default: "none" },
+            { property: "text-decoration-style", valuesToTest:["solid", "double", "dotted", "dashed", "wavy"], default: "solid" },
             { property: "visibility", valuesToTest:["visible", "hidden", "collapse"], default: "visible" },
             { property: "word-spacing", valuesToTest:["31px"], default: "0px" },
             { property: "writing-mode", valuesToTest:["lr-tb", "rl-tb"], default: "lr-tb" },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/motion/parsing/offset-anchor-computed.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/motion/parsing/offset-anchor-computed.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/motion/parsing/offset-anchor-computed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/motion/parsing/offset-anchor-computed.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: getComputedStyle().offsetAnchor</title>
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-anchor-property">
+<meta name="assert" content="offset-anchor is 'auto' or a computed position.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("offset-anchor", "auto");
+
+test_computed_value("offset-anchor", "left bottom", "0% 100%");
+test_computed_value("offset-anchor", "center center", "50% 50%");
+test_computed_value("offset-anchor", "right center", "100% 50%");
+test_computed_value("offset-anchor", "center top", "50% 0%");
+test_computed_value("offset-anchor", "center bottom", "50% 100%");
+test_computed_value("offset-anchor", "calc(20% - 5em) center", "calc(20% - 200px) 50%");
+test_computed_value("offset-anchor", "right 4em", "100% 160px");
+test_computed_value("offset-anchor", "10px 20%");
+test_computed_value("offset-anchor", "left -10px top -20%", "-10px -20%");
+test_computed_value("offset-anchor", "right 10% bottom 20em", "90% calc(100% - 800px)");
+test_computed_value("offset-anchor", "top 10px right -20%", "120% 10px");
+test_computed_value("offset-anchor", "left 10% bottom 20em", "10% calc(100% - 800px)");
+test_computed_value('offset-anchor', 'calc(10px - 0.5em) calc(10px + 0.5em)', '-10px 30px');
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/motion/parsing/offset-distance-computed.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/motion/parsing/offset-distance-computed.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/motion/parsing/offset-distance-computed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/motion/parsing/offset-distance-computed.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: getComputedStyle().offsetDistance</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-distance-property">
+<meta name="assert" content="offset-distance is a computed '<length-percentage>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("offset-distance", "10px");
+test_computed_value("offset-distance", "20%");
+test_computed_value("offset-distance", "calc(40% - 30px)");
+test_computed_value("offset-distance", "0", "0px");
+test_computed_value('offset-distance', 'calc(10px - 0.5em)', '-10px');
+test_computed_value('offset-distance', 'calc(10px + 0.5em)', '30px');
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/motion/parsing/offset-path-computed.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/motion/parsing/offset-path-computed.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/motion/parsing/offset-path-computed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/motion/parsing/offset-path-computed.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: getComputedStyle().offsetPath</title>
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-path-property">
+<meta name="assert" content="offset-path has absolute path commands.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("offset-path", "none");
+
+test_computed_value("offset-path", "ray(0rad closest-side)", "ray(0deg closest-side)");
+test_computed_value("offset-path", "ray(0.25turn closest-corner contain)", "ray(90deg closest-corner contain)");
+test_computed_value("offset-path", "ray(200grad farthest-side)", "ray(180deg farthest-side)");
+test_computed_value("offset-path", "ray(270deg farthest-corner contain)");
+test_computed_value("offset-path", "ray(-720deg sides)");
+test_computed_value("offset-path", "ray(calc(180deg - 45deg) farthest-side)", "ray(calc(135deg) farthest-side)");
+
+test_computed_value("offset-path", 'path("m 20 0 h -100")', 'path("M 20 0 H -80")');
+test_computed_value("offset-path", 'path("M 0 0 L 100 100 M 100 200 L 200 200 Z L 300 300 Z")');
+test_computed_value("offset-path", 'path("m 10 20 q 30 60 40 50 q 100 70 90 80")', 'path("M 10 20 Q 40 80 50 70 Q 150 140 140 150")');
+test_computed_value("offset-path", 'path("M 0 0 L 100 100 m 0 100 l 100 0 Z l 160 20 Z")', 'path("M 0 0 L 100 100 M 100 200 L 200 200 Z L 260 220 Z")');
+test_computed_value("offset-path", 'path("m 10 20 l 20 30 Z l 50 60 Z m 70 80 l 90 60 Z t 70 120")', 'path("M 10 20 L 30 50 Z L 60 80 Z M 80 100 L 170 160 Z T 150 220")');
+test_computed_value("offset-path", 'path("m 10 170 h 90 v 30 m 0 0 s 1 2 3 4 z c 9 8 7 6 5 4")', 'path("M 10 170 H 100 V 200 M 100 200 S 101 202 103 204 Z C 109 208 107 206 105 204")');
+test_computed_value("offset-path", 'path("m 10 20 a 10 20 30 1 0 40 50 a 110 120 30 1 1 140 50")', 'path("M 10 20 A 10 20 30 1 0 50 70 A 110 120 30 1 1 190 120")');
+
+// url, shape and geometry-box paths are not yet supported by implementations.
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/motion/parsing/offset-position-computed.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/motion/parsing/offset-position-computed.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/motion/parsing/offset-position-computed.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/motion/parsing/offset-position-computed.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: getComputedStyle().offsetPosition</title>
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-position-property">
+<meta name="assert" content="offset-position is 'auto' or a computed position.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("offset-position", "auto");
+
+test_computed_value("offset-position", "left bottom", "0% 100%");
+test_computed_value("offset-position", "center center", "50% 50%");
+test_computed_value("offset-position", "right center", "100% 50%");
+test_computed_value("offset-position", "center top", "50% 0%");
+test_computed_value("offset-position", "center bottom", "50% 100%");
+test_computed_value("offset-position", "calc(5em + 20%) center", "calc(20% + 200px) 50%");
+test_computed_value("offset-position", "right 3em", "100% 120px");
+test_computed_value("offset-position", "10px 20%");
+test_computed_value("offset-position", "left -10px top -20%", "-10px -20%");
+test_computed_value("offset-position", "right 10% bottom 5em", "90% calc(100% - 200px)");
+test_computed_value("offset-position", "top 10px right -20%", "120% 10px");
+test_computed_value("offset-position", "left 10% bottom 2em", "10% calc(100% - 80px)");
+test_computed_value('offset-position', 'calc(10px - 0.5em) calc(10px + 0.5em)', '-10px 30px');
+</script>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html	2019-09-15 11:33:26.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -62,5 +62,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div>  <!-- Saturate the margin space -->
     <div class="shape"></div>
     <div class="box"></div>
@@ -58,5 +58,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="longbox"></div>  <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html	2019-09-15 11:33:28.000000000 +0000
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -63,5 +63,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div>  <!-- Saturate the margin space -->
     <div class="shape"></div>
     <div class="box"></div>
@@ -59,5 +59,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="longbox"></div>  <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html	2019-09-15 11:33:26.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; left: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="height: 24px; top: 20px; left: 128px;"></div> <!-- Box at corner -->
@@ -49,5 +49,5 @@
     <div class="box" style="height: 36px; top: 80px; left: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; left: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; left: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -33,11 +33,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; left: 120px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 108px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html	2019-09-15 11:33:26.000000000 +0000
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; right: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="height: 24px; top: 20px; right: 128px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="height: 36px; top: 80px; right: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; right: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; right: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html	2019-09-15 11:33:28.000000000 +0000
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; right: 120px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 120px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 108px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html	2019-09-15 11:33:26.000000000 +0000
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 128px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html	2019-09-15 11:33:26.000000000 +0000
@@ -46,7 +46,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -54,5 +54,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 128px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html	2019-09-15 11:33:26.000000000 +0000
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html	2019-09-15 11:33:28.000000000 +0000
@@ -46,7 +46,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -54,5 +54,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html	2019-09-15 11:33:26.000000000 +0000
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html	2019-09-15 11:33:26.000000000 +0000
@@ -46,7 +46,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -54,5 +54,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html	2019-09-15 11:33:26.000000000 +0000
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html	2019-09-15 11:33:28.000000000 +0000
@@ -46,7 +46,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -54,5 +54,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html	2019-09-15 11:33:26.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px;"></div>
@@ -50,5 +50,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px; top: 0px; left: 60px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="height: 36px; top: 120px; left: 60px;"></div>
     <div class="box" style="height: 12px; top: 156px; left: 48px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 168px; left: 36px;"></div>  <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html	2019-09-15 11:33:26.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space above the first float -->
@@ -51,5 +51,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px; top: 0px; left: 0px;"></div> <!-- Fill the space above the first float -->
@@ -48,5 +48,5 @@
     <div class="box" style="height: 36px; top: 180px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 216px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 228px; left: 120px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html	2019-09-15 11:33:26.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px;"></div>
@@ -51,5 +51,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px; top: 0px; right: 60px;"></div>
@@ -48,5 +48,5 @@
     <div class="box" style="height: 36px; top: 120px; right: 60px;"></div>
     <div class="box" style="height: 12px; top: 156px; right: 48px;"></div>
     <div class="box" style="height: 12px; top: 168px; right: 36px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html	2019-09-15 11:33:28.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space above the first float -->
@@ -52,5 +52,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px; top: 0px; right: 0px;"></div> <!-- Fill the space above the first float -->
@@ -49,5 +49,5 @@
     <div class="box" style="height: 36px; top: 180px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 216px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 228px; right: 120px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html	2019-09-15 11:33:26.000000000 +0000
@@ -36,7 +36,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -44,5 +44,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -33,7 +33,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; left: 96px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; left: 108px;"></div> <!-- Box at corner -->
@@ -41,5 +41,5 @@
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; left: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; left: 96px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html	2019-09-15 11:33:27.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html	2019-09-15 11:33:26.000000000 +0000
@@ -36,7 +36,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -44,5 +44,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html	2019-09-15 11:33:26.000000000 +0000
@@ -36,7 +36,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
@@ -44,5 +44,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -33,7 +33,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 12px; left: 120px;"></div>
@@ -41,5 +41,5 @@
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 108px; left: 120px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html	2019-09-15 11:33:28.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; right: 96px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; right: 108px;"></div> <!-- Box at corner -->
@@ -42,5 +42,5 @@
     <div class="box" style="height: 36px; top: 60px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; right: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; right: 96px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html	2019-09-15 11:33:27.000000000 +0000
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -46,5 +46,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html	2019-09-15 11:33:26.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html	2019-09-15 11:33:26.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 12px; right: 120px;"></div>
@@ -42,5 +42,5 @@
     <div class="box" style="height: 36px; top: 60px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 108px; right: 120px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html	2019-09-15 11:33:28.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html	2019-09-15 11:33:26.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html	2019-09-15 11:33:28.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html	2019-09-15 11:33:26.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html	2019-09-15 11:33:28.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -62,5 +62,5 @@
     <div class="longbox"></div> <!-- Saturate the padding space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the padding space -->
@@ -58,5 +58,5 @@
     <div class="longbox"></div> <!-- Saturate the padding space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -62,5 +62,5 @@
     <div class="longbox"></div> <!-- Saturate the padding space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the padding space -->
@@ -59,5 +59,5 @@
     <div class="longbox"></div> <!-- Saturate the padding space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html	2019-09-15 11:33:26.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; left: 0;"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px; top: 20px; left: 128px;"></div> <!-- Box at corner -->
@@ -49,5 +49,5 @@
     <div class="box" style="height: 36px; top: 80px; left: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; left: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; left: 0;"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; right: 0;"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px; top: 20px; right: 128px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="height: 36px; top: 80px; right: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; right: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; right: 0;"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html	2019-09-15 11:33:28.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px;"></div>
@@ -48,5 +48,5 @@
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space between two floats -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px; top: 0px; left: 40px;"></div>
@@ -45,5 +45,5 @@
     <div class="long box" style="height: 60px; top: 60px; left: 0px;"></div> <!-- Fill the space between two floats -->
     <div class="box" style="height: 36px; top: 120px; left: 40px;"></div>
     <div class="box" style="height: 24px; top: 156px; left: 32px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html	2019-09-15 11:33:26.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space above the first float -->
@@ -51,5 +51,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px; top: 0px; left: 0px;"></div> <!-- Fill the space above the first float -->
@@ -48,5 +48,5 @@
     <div class="box" style="height: 36px; top: 180px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 216px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 228px; left: 120px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html	2019-09-15 11:33:26.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px;"></div>
@@ -49,5 +49,5 @@
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space between two floats -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px; top: 0px; right: 40px;"></div>
@@ -45,5 +45,5 @@
     <div class="long box" style="height: 60px; top: 60px; right: 0px;"></div> <!-- Fill the space between two floats -->
     <div class="box" style="height: 36px; top: 120px; right: 40px;"></div>
     <div class="box" style="height: 24px; top: 156px; right: 32px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html	2019-09-15 11:33:26.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space above the first float -->
@@ -52,5 +52,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px; top: 0px; right: 0px;"></div> <!-- Fill the space above the first float -->
@@ -49,5 +49,5 @@
     <div class="box" style="height: 36px; top: 180px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 216px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 228px; right: 120px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html	2019-09-15 11:33:28.000000000 +0000
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; left: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html	2019-09-15 11:33:26.000000000 +0000
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; left: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -35,11 +35,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; right: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; right: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html	2019-09-15 11:33:28.000000000 +0000
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 0px;"></div>
     <div class="box" style="height: 36px; top: 24px; left: 0px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 0px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 0px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html	2019-09-15 11:33:27.000000000 +0000
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html	2019-09-15 11:33:27.000000000 +0000
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -35,11 +35,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 0px;"></div>
     <div class="box" style="height: 36px; top: 24px; right: 0px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 0px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 0px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html	2019-09-15 11:33:26.000000000 +0000
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 80px;"></div>
     <div class="box" style="height: 36px; top: 24px; left: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 80px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html	2019-09-15 11:33:28.000000000 +0000
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -35,11 +35,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 80px;"></div>
     <div class="box" style="height: 36px; top: 24px; right: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 80px;"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -36,11 +36,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html	2019-09-15 11:33:26.000000000 +0000
@@ -39,11 +39,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -36,11 +36,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html	2019-09-15 11:33:28.000000000 +0000
@@ -39,11 +39,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -36,11 +36,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html	2019-09-15 11:33:26.000000000 +0000
@@ -39,11 +39,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html	2019-09-15 11:33:28.000000000 +0000
@@ -41,11 +41,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 40px;"></div> <!-- Fill the margin and inset space -->
     <div class="box" style="height: 40px;"></div>
     <div class="box" style="height: 40px;"></div>
     <div class="long box" style="height: 40px;"></div> <!-- Fill the margin and inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 40px; top: 0; left: 0;"></div> <!-- Fill the margin and inset space -->
     <div class="box" style="height: 40px; top: 40px; left: 120px;"></div>
     <div class="box" style="height: 40px; top: 80px; left: 120px;"></div>
     <div class="long box" style="height: 40px; top: 120px; left: 0;"></div> <!-- Fill the margin and inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,11 +42,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 40px;"></div> <!-- Fill the margin and inset space -->
     <div class="box" style="height: 40px;"></div>
     <div class="box" style="height: 40px;"></div>
     <div class="long box" style="height: 40px;"></div> <!-- Fill the margin and inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -39,11 +39,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 40px; top: 0; right: 0;"></div> <!-- Fill the margin and inset space -->
     <div class="box" style="height: 40px; top: 40px; right: 120px;"></div>
     <div class="box" style="height: 40px; top: 80px; right: 120px;"></div>
     <div class="long box" style="height: 40px; top: 120px; right: 0;"></div> <!-- Fill the margin and inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html	2019-09-15 11:33:28.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html	2019-09-15 11:33:28.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html	2019-09-15 11:33:26.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box"></div>
@@ -54,5 +54,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="box"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -33,7 +33,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box"></div>
@@ -50,5 +50,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="box"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box"></div>
@@ -55,5 +55,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="box"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box"></div>
@@ -51,5 +51,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="box"></div>
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html	2019-09-15 11:33:28.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; left: 96px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; left: 108px;"></div> <!-- Box at corner -->
@@ -42,5 +42,5 @@
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; left: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; left: 96px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; left: 120px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 108px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -46,5 +46,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -35,7 +35,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; right: 96px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; right: 108px;"></div> <!-- Box at corner -->
@@ -43,5 +43,5 @@
     <div class="box" style="height: 36px; top: 60px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; right: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; right: 96px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html	2019-09-15 11:33:26.000000000 +0000
@@ -45,11 +45,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,11 +42,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; right: 120px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 120px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 108px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html	2019-09-15 11:33:28.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; left: 96px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; left: 108px;"></div> <!-- Box at corner -->
@@ -42,5 +42,5 @@
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; left: 120px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; left: 120px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html	2019-09-15 11:33:26.000000000 +0000
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; left: 120px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; left: 120px;"></div> <!-- Box at corner -->
@@ -42,5 +42,5 @@
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; left: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; left: 96px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="bfc">
+  <main class="bfc">
     <span class="container">
       <div class="shape"></div>
     </span>
@@ -53,5 +53,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html	2019-09-15 11:33:28.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -62,5 +62,5 @@
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="shape"></div>
@@ -58,5 +58,5 @@
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -62,5 +62,5 @@
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="shape"></div>
@@ -59,5 +59,5 @@
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html	2019-09-15 11:33:26.000000000 +0000
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; left: 0;"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px; top: 20px; left: 128px;"></div> <!-- Box at corner -->
@@ -49,5 +49,5 @@
     <div class="box" style="height: 36px; top: 80px; left: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; left: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; left: 0;"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html	2019-09-15 11:33:26.000000000 +0000
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; right: 0;"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px; top: 20px; right: 128px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="height: 36px; top: 80px; right: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; right: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; right: 0;"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html	2019-09-15 11:33:28.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="height: 30px;"></div>
@@ -50,5 +50,5 @@
     <div class="box" style="height: 20px;"></div>
     <div class="box" style="height: 30px;"></div>
     <div class="long box" style="height: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 30px; top: 0; left: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="height: 30px; top: 30px; left: 100px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="height: 20px; top: 80px; left: 80px;"></div>
     <div class="box" style="height: 30px; top: 100px; left: 80px;"></div>
     <div class="long box" style="height: 30px; top: 130px; left: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="height: 30px;"></div>
@@ -51,5 +51,5 @@
     <div class="box" style="height: 20px;"></div>
     <div class="box" style="height: 30px;"></div>
     <div class="long box" style="height: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 30px; top: 0; right: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="height: 30px; top: 30px; right: 80px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="height: 20px; top: 80px; right: 120px;"></div>
     <div class="box" style="height: 30px; top: 100px; right: 100px;"></div>
     <div class="long box" style="height: 30px; top: 130px; right: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 80px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 100px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 100px;"></div>
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 80px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html	2019-09-15 11:33:28.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 100px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 80px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 80px;"></div>
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 100px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html	2019-09-15 11:33:26.000000000 +0000
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 80px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 100px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html	2019-09-15 11:33:26.000000000 +0000
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 100px;"></div>
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 80px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/docs/index.md firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/docs/index.md
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/docs/index.md	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/docs/index.md	2019-09-15 11:33:28.000000000 +0000
@@ -11,14 +11,29 @@
 without needing extra layers of abstraction to paper over the gaps left by
 specification editors and implementors.
 
-## Help!
+The most important sources of information and activity are:
 
-If you get stuck or want clarification about anything, feel free to
-ask on either the [mailing list][public-test-infra] or [IRC][]
-([webclient][web irc], join channel `#testing`); IRC is generally
-busiest during the European working day but frequently has people on
-it at all times and should probably be the general first port of call
-for any help.
+- [github.com/web-platform-tests/wpt](https://github.com/web-platform-tests/wpt):
+  the canonical location of the project's source code revision history and the
+  discussion forum for changes to the code
+- [web-platform-tests.org](https://web-platform-tests.org): the documentation
+  website; details how to set up the project, how to write tests, how to give
+  and receive peer review, how to serve as an administrator, and more
+- [web-platform-tests.live](http://web-platform-tests.live): a public
+  deployment of the test suite, allowing anyone to run the tests by visiting
+  from an Internet-enabled browser of their choice
+- [wpt.fyi](https://wpt.fyi): an archive of test results collected from an
+  array of web browsers on a regular basis
+- [Real-time chat room](http://irc.w3.org/?channels=testing): the
+  [IRC](http://www.irchelp.org/) chat room named `#testing` on
+  [irc.w3.org](https://www.w3.org/wiki/IRC); includes participants located
+  around the world, but busiest during the European working day; [all
+  discussion is archived here](https://w3.logbot.info/testing)
+- [Mailing list](https://lists.w3.org/Archives/Public/public-test-infra/): a
+  public and low-traffic discussion list
+
+**If you'd like clarification about anything**, don't hesitate to ask in the
+chat room or on the mailing list.
 
 ## Watch a Talk
 
@@ -55,7 +70,4 @@
    admin/index
 ```
 
-[public-test-infra]: https://lists.w3.org/Archives/Public/public-test-infra/
-[IRC]: irc://irc.w3.org:6667/testing
-[web irc]: http://irc.w3.org
 [github-intro]: writing-tests/github-intro
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/docs/running-tests/from-local-system.md firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/docs/running-tests/from-local-system.md
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/docs/running-tests/from-local-system.md	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/docs/running-tests/from-local-system.md	2019-09-15 11:33:26.000000000 +0000
@@ -49,14 +49,13 @@
 excluded from your proxy lookups.
 
 [The Ahem font](../writing-tests/ahem) is used to test precise rendering
-behavior. [Download the font][download-ahem] and install it using the
-appropriate steps for your platform:
+behavior. This font should be loaded as a web font in tests, using the
+`/fonts/ahem.css` stylesheet, as follows:
+
+```
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+```
 
-- On Windows, right-click the downloaded file in File Explorer/Windows Explorer
-  (depending on Windows version) and select "Install" from the menu.
-- On macOS, open the downloaded file in Font Book (the default application for
-  font files) and then click install.
-- On Linux, copy the file to `~/.local/share/fonts` and then run `fc-cache`.
 
 ### Windows Notes
 
@@ -147,5 +146,3 @@
   android_webview
   safari
 ```
-
-[download-ahem]: https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/docs/writing-tests/assumptions.md firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/docs/writing-tests/assumptions.md
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/docs/writing-tests/assumptions.md	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/docs/writing-tests/assumptions.md	2019-09-15 11:33:26.000000000 +0000
@@ -11,7 +11,6 @@
  * The initial value of `color` is `black`.
  * The user stylesheet is empty (except where indicated by the tests).
  * The device is interactive and uses scroll bars.
- * The device has the Ahem font installed.
  * The HTML `div` element is assigned `display: block;`, the
    `unicode-bidi` property may be declared, and no other property
    declarations.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/docs/writing-tests/general-guidelines.md firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/docs/writing-tests/general-guidelines.md
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/docs/writing-tests/general-guidelines.md	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/docs/writing-tests/general-guidelines.md	2019-09-15 11:33:28.000000000 +0000
@@ -121,10 +121,10 @@
 tests that rely on anything else should be manual tests that document
 their assumptions.
 
-Aside from the [Ahem font][ahem], fonts cannot be relied on to be
-either installed or to have specific metrics. As such, in most cases
-when a known font is needed Ahem should be used. In other cases,
-`@font-face` should be used.
+Fonts cannot be relied on to be either installed or to have specific
+metrics. As such, in most cases when a known font is needed, [Ahem][ahem]
+should be used and loaded as a web font. In other cases, `@font-face`
+should be used.
 
 
 ### Be Self-Contained
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/docs/writing-tests/rendering.md firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/docs/writing-tests/rendering.md
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/docs/writing-tests/rendering.md	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/docs/writing-tests/rendering.md	2019-09-15 11:33:26.000000000 +0000
@@ -20,8 +20,8 @@
    renders a green square when it passes; these can mostly be written to
    match [this][ref-filled-green-100px-square] reference. This green square is
    often rendered over a red square, such that when the test fails there is red
-   visible on the page; this can even be done using text by using the [Ahem][]
-   font.
+   visible on the page; this can even be done using text by using the
+   [Ahem][ahem] font.
 
 More occasionally, the entire canvas is rendered green, typically when
 testing parts of CSS that affect the entire page. Care has to be taken
@@ -81,3 +81,4 @@
 colors!
 
 [ref-filled-green-100px-square]: https://github.com/w3c/csswg-test/blob/master/reference/ref-filled-green-100px-square.xht
+[ahem]: ahem
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/fetch/sec-metadata/img.tentative.https.sub.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/fetch/sec-metadata/img.tentative.https.sub.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/fetch/sec-metadata/img.tentative.https.sub.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/fetch/sec-metadata/img.tentative.https.sub.html	2019-09-15 11:33:27.000000000 +0000
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
-<script src=/common/security-features/resources/common.js></script>
+<script src=/common/security-features/resources/common.sub.js></script>
 <script src=/fetch/sec-metadata/resources/helper.js></script>
 <body>
 <script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/fetch/sec-metadata/redirect/multiple-redirect-https-downgrade-upgrade.tentative.sub.html	2019-09-15 11:33:26.000000000 +0000
@@ -4,7 +4,7 @@
 <script src=/resources/testharnessreport.js></script>
 <script src=/fetch/sec-metadata/resources/helper.js></script>
 <script src=/fetch/sec-metadata/resources/redirectTestHelper.sub.js></script>
-<script src=/common/security-features/resources/common.js></script>
+<script src=/common/security-features/resources/common.sub.js></script>
 <script src=/common/utils.js></script>
 <style>
   @font-face {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html	2019-09-15 11:33:27.000000000 +0000
@@ -4,7 +4,7 @@
 <script src=/resources/testharnessreport.js></script>
 <script src=/fetch/sec-metadata/resources/helper.js></script>
 <script src=/fetch/sec-metadata/resources/redirectTestHelper.sub.js></script>
-<script src=/common/security-features/resources/common.js></script>
+<script src=/common/security-features/resources/common.sub.js></script>
 <script src=/common/utils.js></script>
 <style>
   @font-face {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/fetch/sec-metadata/redirect/redirect-http-upgrade.tentative.sub.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/fetch/sec-metadata/redirect/redirect-http-upgrade.tentative.sub.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/fetch/sec-metadata/redirect/redirect-http-upgrade.tentative.sub.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/fetch/sec-metadata/redirect/redirect-http-upgrade.tentative.sub.html	2019-09-15 11:33:28.000000000 +0000
@@ -4,7 +4,7 @@
 <script src=/resources/testharnessreport.js></script>
 <script src=/fetch/sec-metadata/resources/helper.js></script>
 <script src=/fetch/sec-metadata/resources/redirectTestHelper.sub.js></script>
-<script src=/common/security-features/resources/common.js></script>
+<script src=/common/security-features/resources/common.sub.js></script>
 <script src=/common/utils.js></script>
 <style>
   @font-face {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-01-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  #a {
+    forced-color-adjust: auto;
+  }
+  #b {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div id="a">
+    A backplate should be drawn behind the text
+    <br>
+    in forced colors mode
+    <br>
+    (forced-color-adjust is set to auto.)
+  </div>
+  <br><br><br>
+  <div id="b">
+    There should NOT be a backplate drawn behind the text
+    <br>
+    in forced colors mode
+    <br>
+    (forced-color-adjust is set to none.)
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  #a {
+    background-color: Window;
+  }
+</style>
+<body>
+  <div id="a">
+    A backplate should be drawn behind the text
+    <br>
+    in forced colors mode
+    <br>
+    (forced-color-adjust is set to auto.)
+  </div>
+  <br><br><br>
+  <div>
+    There should NOT be a backplate drawn behind the text
+    <br>
+    in forced colors mode
+    <br>
+    (forced-color-adjust is set to none.)
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests that the backplate feature with a varying number of line breaks.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-02-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+</style>
+<body>
+  <span>
+    This text <br> should have <br> its own backplate <br> in forced colors mode.
+  </span>
+  <br>
+  <br>
+  <span>
+    This text should have its own backplate in forced colors mode:
+    <br>
+    two br tags indicates a new paragraph.
+  </span>
+  <br>
+  <span>
+    This text should share a backplate with the above text:
+    <br>
+    one br tag used.
+  </span>
+  <br>
+  <br>
+  <br>
+  <br>
+  <span>
+    This text should have its own backplate in forced colors mode:
+    <br>
+    four br tags indicates a new paragraph.
+  </span>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests that the backplate feature with a varying number of line breaks.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  div {
+    background-color: Window;
+  }
+</style>
+<body>
+  <div>
+   This text <br> should have <br> its own backplate <br> in forced colors mode.
+  </div>
+  <br>
+  <div>
+    This text should have its own backplate in forced colors mode:
+    <br>
+    two br tags indicates a new paragraph.
+    <br>
+    This text should share a backplate with the above text:
+    <br>
+    one br tag used.
+  </div>
+  <br>
+  <br>
+  <br>
+  <div>
+    This text should have its own backplate in forced colors mode:
+    <br>
+    four br tags indicates a new paragraph.
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests the backplate feature behind lists.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-03-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    left: 0%;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  li {
+    margin-left: -8px;
+  }
+  #a {
+    forced-color-adjust: auto;
+  }
+  #b {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div id="a">
+    <li>
+      There should be a backplate drawn
+  </div>
+  <br>
+  <div id="a">
+    <li>
+      behind the first three list items
+  </div>
+  <br>
+  <div id="a">
+    <li>
+      in forced colors mode.
+  </div>
+  <br>
+  <div id="b">
+    <li>
+      There should be NO backplate drawn
+  </div>
+  <br>
+  <div id="b">
+    <li>
+      behind the last three list items
+  </div>
+  <br>
+  <div id="b">
+    <li>
+      in forced colors mode.
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests the backplate feature behind lists.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    left: 0%;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  li {
+    margin-left: -8px;
+  }
+</style>
+<body>
+  <div>
+    <li style="background-color: Window;">
+      There should be a backplate drawn
+  </div>
+  <br>
+  <div>
+    <li style="background-color: Window;">
+      behind the first three list items
+  </div>
+  <br>
+  <div>
+    <li style="background-color: Window;">
+      in forced colors mode.
+  </div>
+  <br>
+  <div>
+    <li>
+      There should be NO backplate drawn
+  </div>
+  <br>
+  <div>
+    <li>
+      behind the last three list items
+  </div>
+  <br>
+  <div>
+    <li>
+      in forced colors mode.
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests the backplate feature behind links.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-04-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  #a {
+    forced-color-adjust: auto;
+  }
+  #b {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div id="a">
+    This text should have a backplate drawn
+    <br>
+    in forced colors mode
+    <br>
+    that includes the following link:
+    <br>
+    <a href="https://www.wikipedia.org/">LINK</a>
+  </div>
+  <br><br><br><br>
+  <div id="b">
+    This text should NOT have a backplate drawn
+    <br>
+    in forced colors mode
+    <br>
+    including for the following link:
+    <br>
+    <a href="https://www.wikipedia.org/">LINK</a>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests the backplate feature behind links.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  #a {
+    background-color: Window;
+  }
+</style>
+<body>
+  <div id="a">
+    This text should have a backplate drawn
+    <br>
+    in forced colors mode
+    <br>
+    that includes the following link:
+    <br>
+    <a href="https://www.wikipedia.org/">LINK</a>
+  </div>
+  <br><br><br><br>
+  <div>
+    This text should NOT have a backplate drawn
+    <br>
+    in forced colors mode
+    <br>
+    including for the following link:
+    <br>
+    <a href="https://www.wikipedia.org/">LINK</a>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests the backplate feature for display inline/relative position.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-05-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+  }
+  li {
+    display: inline;
+    position: relative;
+  }
+  div {
+    text-align: justify;
+    width: 110px;
+  }
+</style>
+<body>
+  <div>
+    <li>The backplate</li>
+    <li>for all of</li>
+    <li>the elements</li>
+    <li>in this list</li>
+    <li>should create</li>
+    <li>one single</li>
+    <li>paragraph</li>
+    <li>in forced</li>
+    <li>colors mode.</li>
+    <li>The backplate</li>
+    <li>should not be</li>
+    <li>painted for</li>
+    <li>each individual</li>
+    <li>list item</li>
+    <li>separately.</li>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests the backplate feature for display inline/relative position.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    line-height: 10px;
+  }
+  li {
+    display: inline;
+    position: relative;
+  }
+  div {
+    background: Window;
+    text-align: justify;
+    width: 110px;
+  }
+</style>
+<body>
+  <div>
+    <li>The backplate</li>
+    <li>for all of</li>
+    <li>the elements</li>
+    <li>in this list</li>
+    <li>should create</li>
+    <li>one single</li>
+    <li>paragraph</li>
+    <li>in forced</li>
+    <li>colors mode.</li>
+    <li>The backplate</li>
+    <li>should not be</li>
+    <li>painted for</li>
+    <li>each individual</li>
+    <li>list item</li>
+    <li>separately.</li>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests that inline spans with different forced-color-adjust values from their
+  parent element follow the backplate behavior of that parent in forced colors
+  mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-06-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+</style>
+<body>
+  <div style="forced-color-adjust: none;">
+    This text should not have a backplate in forced colors mode.
+    <br>
+    <span style="forced-color-adjust: auto">
+      This text should not have a backplate in forced colors mode.
+    </span>
+  </div>
+  <br>
+  <br>
+  <br>
+  <br>
+  <div style="forced-color-adjust: auto;">
+    This text should have a backplate in forced colors mode.
+    <br>
+    <span style="forced-color-adjust: none">
+      This text should have a backplate in forced colors mode.
+    </span>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests that inline spans with different forced-color-adjust values from their
+  parent element follow the backplate behavior of that parent in forced colors
+  mode.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+</style>
+<body>
+  <div>
+    This text should not have a backplate in forced colors mode.
+    <br>
+    This text should not have a backplate in forced colors mode.
+  </div>
+  <br>
+  <br>
+  <br>
+  <br>
+  <div style="background: Window;">
+    This text should have a backplate in forced colors mode.
+    <br>
+    This text should have a backplate in forced colors mode.
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests backplate is drawn when text is located outside the cull rect.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-08-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+  }
+</style>
+<body>
+  The text below should have a backplate in forced colors mode.
+  <div>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <span>This text should have a backplate.</span>
+  </div>
+</body>
+
+<script>
+  function scroll() {
+    window.scrollBy(0, 5000);
+  }
+  onload = scroll;
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+    Forced colors mode - backplate reference.
+    Tests backplate is drawn when text is located outside the cull rect.
+  </title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+  }
+  span {
+    background-color: Window;
+  }
+</style>
+<body>
+  <span>
+    The text below should have a backplate in forced colors mode.
+  </span>
+  <div>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <span>This text should have a backplate.</span>
+  </div>
+</body>
+
+<script>
+  function scroll() {
+    window.scrollBy(0, 5000);
+  }
+  onload = scroll;
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests that backplate is not drawn above floats.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-09-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 20px;
+    line-height: 20px;
+    text-align: justify;
+    width: 200px;
+  }
+  img {
+    float: left;
+  }
+</style>
+<body>
+  <div>
+    <img src="../resources/float-image.jpg" style="width:50px;height:50px;">
+    In forced colors mode, the backplate for this paragraph should lie below the
+    the floating image.
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests that backplate is not drawn above floats.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 20px;
+    forced-color-adjust: none; /* This turns the backplate feature off in forced colors mode.
+                                  The backplate is simulated in testing using a background-color
+                                  of Window behind the text.
+                                */
+    line-height: 20px;
+    text-align: justify;
+    width: 200px;
+  }
+  img {
+    float: left;
+  }
+  div {
+    background-color: Window;
+  }
+</style>
+<body>
+  <div>
+    <img src="../resources/float-image.jpg" style="width:50px;height:50px;">
+    In forced colors mode, the backplate for this paragraph should lie below the
+    the floating image.
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests that backplates of overlapping inline boxes do not overlap.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-10-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+</style>
+<body>
+  <div>
+    <div>
+      The two backplates should not overlap
+    </div>
+    <br>
+    <div style="margin-top: -25px; z-index: -1;">
+      in forced colors mode.
+    </div>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests that backplates of overlapping inline boxes do not overlap.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in forced colors mode.
+                                  The backplate is simulated in testing using a background-color
+                                  of Window behind the text.
+                                */
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  div {
+    background-color: Window;
+  }
+</style>
+<body>
+  <div>
+    <div>
+      The two backplates should not overlap
+    </div>
+    <br>
+    <div style="margin-top: -25px; z-index: -1;">
+      in forced colors mode.
+    </div>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-01.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-01.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-01.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-01.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test forced colors mode on table styles</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-01-ref.html">
+<style>
+  table {
+    border-collapse: collapse;
+  }
+
+  td, th {
+    border: 1px solid;
+    border-bottom-color: black;
+    border-left-color: purple;
+    border-right-color: orange;
+    border-top-color: green;
+    padding: 8px;
+    text-align: left;
+  }
+
+  tr:nth-child(even) {
+    background-color: blue;
+    color: red;
+  }
+</style>
+<body>
+  <table>
+    <tr>
+      <th>Column1</th>
+      <th>Column2</th>
+      <th>Column3</th>
+    </tr>
+    <tr>
+      <td>Entry1</td>
+      <td>Entry1</td>
+      <td>Entry1</td>
+    </tr>
+    <tr>
+      <td>Entry2</td>
+      <td>Entry2</td>
+      <td>Entry2</td>
+    </tr>
+  </table>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-01-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-01-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-01-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-01-ref.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test forced colors mode on table styles reference</title>
+<style>
+  body {
+    forced-color-adjust: none;
+  }
+  table {
+    border-collapse: collapse;
+  }
+  td, th {
+    border: 1px solid;
+    border-bottom-color: WindowText;
+    border-left-color: WindowText;
+    border-right-color: WindowText;
+    border-top-color: WindowText;
+    forced-color-adjust: none;
+    padding: 8px;
+    text-align: left;
+  }
+  tr:nth-child(even) {
+    background-color: Window;
+    color: WindowText;
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <table>
+    <tr>
+      <th>Column1</th>
+      <th>Column2</th>
+      <th>Column3</th>
+    </tr>
+    <tr>
+      <td>Entry1</td>
+      <td>Entry1</td>
+      <td>Entry1</td>
+    </tr>
+    <tr>
+      <td>Entry2</td>
+      <td>Entry2</td>
+      <td>Entry2</td>
+    </tr>
+  </table>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-02.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-02.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-02.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-02.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - style overrides for text.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-02-ref.html">
+<style>
+  body {
+    background-color: lightblue;
+  }
+  #a {
+    background-color: lightgreen;
+    border: 25px solid green;
+    box-shadow: 2px 2px purple;
+    color: orange;
+    forced-color-adjust: auto;
+    margin: 25px;
+    padding: 25px;
+    text-shadow: 1px 1px gray;
+    width: 300px;
+  }
+  #b {
+    background-color: lightgreen;
+    border: 25px solid green;
+    box-shadow: 2px 2px purple;
+    color: orange;
+    forced-color-adjust: none;
+    margin: 25px;
+    padding: 25px;
+    text-shadow: 1px 1px gray;
+    width: 300px;
+  }
+</style>
+<body>
+  <div id="a">
+    The colors and shadows of this text and text box should be overridden when in
+    forced colors mode (forced-color-adjust is set to auto.)
+  </div>
+  <div id="b">
+    The colors and shadows of this text and text box should NOT be overridden when in
+    forced colors mode (forced-color-adjust is set to none.)
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-02-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-02-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-02-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-02-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - style overrides for text reference.</title>
+<style>
+  body {
+    background-color: lightblue;
+  }
+  #a {
+    background-color: Window;
+    border: 25px solid WindowText;
+    box-shadow: 2px 2px Window;
+    color: WindowText;
+    forced-color-adjust: none;
+    margin: 25px;
+    padding: 25px;
+    text-shadow: 1px 1px Window;
+    width: 300px;
+  }
+  #b {
+    background-color: lightgreen;
+    border: 25px solid green;
+    box-shadow: 2px 2px purple;
+    color: orange;
+    forced-color-adjust: none;
+    margin: 25px;
+    padding: 25px;
+    text-shadow: 1px 1px gray;
+    width: 300px;
+  }
+</style>
+<body>
+  <div id="a">
+    The colors and shadows of this text and text box should be overridden when in
+    forced colors mode (forced-color-adjust is set to auto.)
+  </div>
+  <div id="b">
+    The colors and shadows of this text and text box should NOT be overridden when in
+    forced colors mode (forced-color-adjust is set to none.)
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-03.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-03.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-03.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-03.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - highlighted text.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #a {
+    color: orange;
+    forced-color-adjust: auto;
+  }
+  #b {
+    color: orange;
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <mark id="a">
+    This text should be black in forced colors mode because forced-color-adjust
+    is auto. The backgroud color should be yellow because the default
+    highlighted colors should not be overridden in forced colors mode.
+  </mark>
+  <mark id="b">
+    This text should be orange in forced colors mode because
+    forced-color-adjust is none. The backgroud color should be yellow because
+    the default highlighted colors should not be overridden in forced colors
+    mode.
+  </mark>
+</body>
+
+<script>
+  test(function(){
+    assert_equals(getComputedStyle(a).color, "rgb(0, 0, 0)");
+
+    assert_equals(getComputedStyle(b).color, "rgb(255, 165, 0)");
+
+    assert_equals(getComputedStyle(a).backgroundColor, "rgb(255, 255, 0)");
+
+    assert_equals(getComputedStyle(b).backgroundColor, "rgb(255, 255, 0)");
+
+  }, "Checks that default highlighted text style does not get overridden in forced colors mode.");
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-04.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-04.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-04.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-04.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - webkit-tap-highlight-color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  a {
+    -webkit-tap-highlight-color: rgb(0, 0, 255);
+  }
+</style>
+<body>
+  <p>
+    <a href="https://www.wikipedia.org" id="link">
+      This link color should be overridden when forced colors mode is enabled.
+    </a>
+  </p>
+</body>
+
+<script>
+  test(function(){
+    assert_equals(getComputedStyle(link).webkitTapHighlightColor, "rgba(0, 0, 0, 0.18)");
+  }, "Checks hyperlinks are overridden in forced colors mode.");
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-05.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-05.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-05.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-05.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - link color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-05-ref.html">
+<style>
+  a {
+    color: rgb(255, 0, 0);
+  }
+</style>
+<body>
+  <p>
+    <a href="https://www.wikipedia.org" id="link">
+      This link color should be overridden when forced colors mode is enabled.
+    </a>
+  </p>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-05-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-05-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-05-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-05-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - link color reference.</title>
+<style>
+  a {
+    color: LinkText;
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <p>
+    <a href="https://www.wikipedia.org" id="link">
+      This link color should be overridden when forced colors mode is enabled.
+    </a>
+  </p>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-06.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-06.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-06.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-06.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - iframe.
+  Test that styles are overridden inside iframes in forced colors mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-06-ref.html">
+<body>
+  <iframe src="forced-colors-mode-02.html" width="500" height="500"></iframe>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-06-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-06-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-06-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-06-ref.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - iframe reference.
+  Test that styles are overridden inside iframes in forced colors mode.
+</title>
+<body>
+  <iframe src="forced-colors-mode-02-ref.html" width="500" height="500"></iframe>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-07.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-07.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-07.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-07.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - transparent colors.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-07-ref.html">
+<style>
+  p {
+    color: transparent;
+  }
+</style>
+<body>
+  <div style="background-color: rgb(0, 0, 255);">
+    <p>
+      The text color should be overridden, and the background color of the
+      div element should also be overridden in forced colors mode.
+    </p>
+  </div>
+  <div style="background-color: transparent;">
+    <p>
+      The text color should be overridden, but the background color of the
+      div element should remain transparent in forced colors mode.
+    </p>
+  </div>
+  <div style="background-color: rgba(0, 0, 0, 0);">
+    <p>
+      The text color should be overridden, but the background color of the
+      div element should remain transparent in forced colors mode.
+    </p>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-07-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-07-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-07-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-07-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - transparent colors reference.</title>
+<style>
+  p {
+    color: WindowText;
+    forced-color-adjust: none;
+  }
+  div {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div style="background-color: Window;">
+    <p>
+      The text color should be overridden, and the background color of the
+      div element should also be overridden in forced colors mode.
+    </p>
+  </div>
+  <div style="background-color: transparent;">
+    <p>
+      The text color should be overridden, but the background color of the
+      div element should remain transparent in forced colors mode.
+    </p>
+  </div>
+  <div style="background-color: rgba(0, 0, 0, 0);">
+    <p>
+      The text color should be overridden, but the background color of the
+      div element should remain transparent in forced colors mode.
+    </p>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-08.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-08.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-08.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-08.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - outline and column color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-08-ref.html">
+<style>
+  h1 {
+    outline-color: rgb(0, 0, 255);
+    outline-style: solid;
+    -webkit-column-count: 3;
+    -webkit-column-gap: 40px;
+    -webkit-column-rule-color: rgb(0, 0, 255);
+    -webkit-column-rule-style: solid;
+  }
+</style>
+<body>
+  <h1>
+    The outline-color and column-rule-color should be blue when forced colors
+    mode is off and WindowText in forced colors mode.
+  </h1>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-08-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-08-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-08-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-08-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - outline and column color reference.</title>
+<style>
+  h1 {
+    forced-color-adjust: none;
+    outline-color: WindowText;
+    outline-style: solid;
+    -webkit-column-count: 3;
+    -webkit-column-gap: 40px;
+    -webkit-column-rule-color: WindowText;
+    -webkit-column-rule-style: solid;
+  }
+</style>
+<body>
+  <h1>
+    The outline-color and column-rule-color should be blue when forced colors
+    mode is off and WindowText in forced colors mode.
+  </h1>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-09.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-09.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-09.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-09.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - forced-colors media query.
+  Tests that styles defined inside or outside a forced-colors media query are
+  overridden in forced colors mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @media (forced-colors) {
+    p {
+      color: rgb(0, 0, 255);
+    }
+  }
+  p {
+    color: rgb(0, 0, 255);
+  }
+</style>
+<body>
+  <p id="p">
+    This text should NOT be blue forced colors mode.
+  </p>
+</body>
+
+<script>
+  test(function() {
+    assert_not_equals(getComputedStyle(p).color, "rgb(0, 0, 255)");
+  }, "Checks that styles defined inside/outside forced-colors are overridden in forced colors mode.");
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-10.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-10.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-10.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-10.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - forced-colors media query.
+  Tests that styles defined inside/outside forced-color media query
+  are preserved in forced colors mode if forced-color-adjust is none
+  and that the ordering of styles is preserved.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  p {
+    background-color: rgb(0, 128, 0);
+    color: rgb(0, 0, 255);
+    forced-color-adjust: none;
+  }
+  @media (forced-colors) {
+    p {
+      background-color: rgb(0, 0, 255);
+      color: rgb(0, 128, 0);
+    }
+  }
+</style>
+<body>
+  <p id="p">
+    This text should be green in forced colors mode.
+  </p>
+</body>
+
+<script>
+  test(function() {
+    assert_equals(getComputedStyle(p).backgroundColor, "rgb(0, 0, 255)");
+    assert_equals(getComputedStyle(p).color, "rgb(0, 128, 0)");
+  }, "Checks that styles defined inside/outside forced-colors are preserved in forced colors mode if forced-color-ajust is none.");
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-11.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-11.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-11.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-11.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - forced-colors media query.
+  Tests that styles defined inside forced-color media query
+  are preserved in forced colors mode if forced-color-adjust
+  is none.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @media (forced-colors: none) {
+    p {
+      background-color: rgb(255, 0, 0);
+      color: rgb(255, 255, 255);
+    }
+  }
+  @media (forced-colors: active) {
+    p {
+      background-color: rgb(0, 0, 255);
+      color: rgb(0, 128, 0);
+      forced-color-adjust: none;
+    }
+  }
+</style>
+</head>
+<body>
+  <p id="p">
+    This text should be green in forced colors mode.
+  </p>
+</body>
+
+<script>
+  test(function() {
+    assert_equals(getComputedStyle(p).backgroundColor, "rgb(0, 0, 255)");
+    assert_equals(getComputedStyle(p).color, "rgb(0, 128, 0)");
+  }, "Checks that styles defined in forced-colors are preserved in forced colors mode.");
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-14.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-14.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-14.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-14.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - active selection.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-14-ref.html">
+<style>
+  br::selection {
+    background-color: transparent;
+    forced-color-adjust: none;
+  }
+  span {
+    /* inline-block to ensure the selection bounding rectangle matches that of the
+       span. This allows us to test selection using a reference test. */
+    display: inline-block;
+  }
+  .select::selection {
+    background-color: rgba(255, 0, 0, 0.99); /* alpha < 1 so that we don't blend the background color with white. */
+    color: blue;
+  }
+  #adjust-none::selection {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <span class="select">AAA</span>
+  <br>
+  <span class="select" id="adjust-none">AAA</span>
+</body>
+
+<script>
+  var node1 = document.getElementsByClassName('select')[0].firstChild;
+  var node2 = document.getElementsByClassName('select')[1].firstChild;
+  var range = document.createRange();
+  range.setStart(node1, 0);
+  range.setEnd(node2, node2.length);
+  window.getSelection().addRange(range);
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-14-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-14-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-14-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-14-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - active selection reference.
+</title>
+<style>
+  span {
+    background-color: Highlight;
+    color: HighlightText;
+    display: inline-block;
+    forced-color-adjust: none;
+  }
+  #adjust-none {
+    background-color: rgba(255, 0, 0, 0.99);
+    color: blue;
+  }
+</style>
+<body>
+  <span class="select">AAA</span>
+  <br>
+  <span class="select" id="adjust-none">AAA</span>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-17.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-17.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-17.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-17.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - text decoration and emphasis color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-17-ref.html">
+<style>
+  p {
+    text-decoration: underline;
+    text-decoration-color: red;
+    -webkit-text-emphasis: '*' blue;
+  }
+</style>
+<body>
+  <p>
+    The text decoration and emphasis color for this text should have a
+    WindowText color in forced colors mode.
+  </p>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-17-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-17-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-17-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-17-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - text decoration and emphasis color reference.</title>
+<style>
+  p {
+    forced-color-adjust: none;
+    text-decoration: underline;
+    text-decoration-color: WindowText;
+    -webkit-text-emphasis: '*' WindowText;
+  }
+</style>
+<body>
+  <p>
+    The text decoration and emphasis color for this text should have a
+    WindowText color in forced colors mode.
+  </p>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - fill and stroke.
+  Only text and foreignObject svg elements should have fill and stroke
+  overridden in forced colors mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-18-ref.html">
+<body>
+  <svg height="600" width="600">
+    <text x="0" y="15" fill="red" stroke="blue">
+      This text should have a WindowText fill and transparent stroke color in
+      forced colors mode.
+    </text>
+    <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
+    <foreignObject x="20" y="100" width="160" height="160">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="color: blue;">
+        This text should be WindowText color in forced colors mode.
+      </div>
+      <svg height="20" width="20">
+        <rect x="0" height="20" y="0" width="20" style="fill: green; stroke: purple;"/>
+      </svg>
+    </foreignObject>
+  </svg>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-18-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - fill and stroke reference.
+  Only text and foreignObject svg elements should have fill and stroke
+  overridden in forced colors mode.
+</title>
+<style>
+  svg, text, foreignObject {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <svg height="600" width="600">
+    <text x="0" y="15" fill="WindowText">
+      This text should have a WindowText fill and transparent stroke color in
+      forced colors mode.
+    </text>
+    <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
+    <foreignObject x="20" y="100" width="160" height="160">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="color: WindowText;">
+        This text should be WindowText color in forced colors mode.
+      </div>
+      <svg height="20" width="20">
+        <rect x="0" height="20" y="0" width="20" style="fill: green; stroke: purple;"/>
+      </svg>
+    </foreignObject>
+  </svg>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-19.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-19.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-19.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-19.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode.
+  Tests that inline images are ignored in forced colors mode when
+  forced-color-adjust is auto.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-19-ref.html">
+<style>
+  div {
+    background-image: url("resources/test-image.jpg");
+    display: inline;
+  }
+  #adjustnone {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div>
+    The background image behind this text should be ignored in forced colors
+    mode.
+  </div>
+  <div id="adjustnone">
+    The background image behind this text should NOT be ignored in forced
+    colors mode.
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-19-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-19-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-19-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-19-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode reference.
+  Tests that inline images are ignored in forced colors mode when
+  forced-color-adjust is auto.
+</title>
+<style>
+  body {
+    forced-color-adjust: none;
+  }
+  div {
+    display: inline;
+  }
+  #adjustnone {
+    background-image:
+      url("resources/test-image.jpg");
+  }
+</style>
+<body>
+  <div>
+    The background image behind this text should be ignored in forced colors
+    mode.
+  </div>
+  <div id="adjustnone">
+    The background image behind this text should NOT be ignored in forced
+    colors mode.
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-20.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-20.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-20.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-20.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - alpha channel.
+  Tests that the alpha channel for background colors are preserved in forced
+  colors mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  div {
+    background-color: rgba(114, 173, 218, .3);
+  }
+</style>
+<body id="body">
+  <div id="div">
+    Background colors should maintain their alpha channels in forced
+    colors mode.
+  </div>
+</body>
+
+<script>
+  var body_color = getComputedStyle(body).backgroundColor;
+  var expected_div_color = body_color.replace(')', ', 0.3)').replace('rgb(', 'rgba(');
+  test(function(){
+    assert_equals(getComputedStyle(div).backgroundColor, expected_div_color);
+  }, "Checks that background color alpha channels are preserved in forced colors mode.");
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-21.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-21.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-21.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-21.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - alpha channel.
+  Tests that the alpha channel for background colors are preserved in forced
+  colors mode at the root node.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  body {
+    background-color: rgba(114, 173, 218, .3);
+  }
+  div {
+    background-color: Window;
+  }
+</style>
+<body id="body">
+  <div id="div">
+    Background colors should maintain their alpha channels in forced
+    colors mode.
+  </div>
+</body>
+
+<script>
+  var div_color = getComputedStyle(div).backgroundColor;
+  var expected_div_color = div_color.replace(')', ', 0.3)').replace('rgb(', 'rgba(');
+  test(function(){
+    assert_equals(getComputedStyle(body).backgroundColor, expected_div_color);
+  }, "Checks that background color alpha channels are preserved in forced colors mode at the root node.");
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-23.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-23.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-23.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-23.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - non-inherited cache.
+  Ensures that forced colors styles don't get overridden by non-inherited
+  cached values.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-23-ref.html">
+<style>
+  div span{
+    background: rgb(0, 128, 0);
+    box-shadow: 5px 10px rgb(255, 255, 0);
+    color: rgb(0, 0, 255);
+  }
+  #a {
+    forced-color-adjust: auto;
+  }
+  #b {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div id="a">
+    <span>text</span>
+  </div>
+  <div id="b">
+    <span>text</span>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-23-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-23-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-23-ref.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/forced-colors-mode-23-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - non-inherited cache reference.
+  Ensures that forced colors styles don't get overridden by non-inherited
+  cached values.
+</title>
+<style>
+  body {
+    forced-color-adjust: none;
+  }
+  #a {
+    color: WindowText;
+  }
+  #b {
+    background: rgb(0, 128, 0);
+    box-shadow: 5px 10px rgb(255, 255, 0);
+    color: rgb(0, 0, 255);
+  }
+</style>
+<body>
+  <div>
+    <span id="a">text</span>
+  </div>
+  <div>
+    <span id="b">text</span>
+  </div>
+</body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/README.txt firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/README.txt
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/README.txt	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/README.txt	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+This directory is for testing Forced Colors mode implementation.
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/resources/float-image.jpg and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/resources/float-image.jpg differ
Binary files /tmp/tmpsU5xqh/DaL08y0lef/firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/forced-colors-mode/resources/test-image.jpg and /tmp/tmpsU5xqh/iLexgStP3j/firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/forced-colors-mode/resources/test-image.jpg differ
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/geolocation-API/getCurrentPosition_IDL.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/geolocation-API/getCurrentPosition_IDL.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/geolocation-API/getCurrentPosition_IDL.https.html	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/geolocation-API/getCurrentPosition_IDL.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -20,31 +20,29 @@
   var ii, oldval;
 
   /*
-    [NoInterfaceObject]
-    interface Position {
-      readonly attribute Coordinates coords;
+    interface GeolocationPosition {
+      readonly attribute GeolocationCoordinates coords;
       readonly attribute DOMTimeStamp timestamp;
     };
   */
 
   test(function() {
-    assert_equals(position.toString(), "[object Position]",
-        "Position.toString should result in '[object Position]' was: " + position.toString());
-  }, "Position toString");
+    assert_equals(position.toString(), "[object GeolocationPosition]",
+        "position.toString should result in '[object GeolocationPosition]' was: " + position.toString());
+  }, "GeolocationPosition toString");
 
   test(function() {
-    assert_equals(position.coords.toString(), "[object Coordinates]",
-        "position.coords.toString should result in '[object Coordinates]' was: " + position.coords.toString());
-  }, "Position.coordinates toString");
+    assert_equals(position.coords.toString(), "[object GeolocationCoordinates]",
+        "position.coords.toString should result in '[object GeolocationCoordinates]' was: " + position.coords.toString());
+  }, "GeolocationCoordinates toString");
 
   test(function() {
     assert_equals(typeof(position.timestamp), "number",
-        "Position.timestamp should be of type 'number' was: " + typeof(position.timestamp));
-  }, "Position.timestamp is type number");
+        "position.timestamp should be of type 'number' was: " + typeof(position.timestamp));
+  }, "GeolocationPosition.timestamp is type number");
 
   /*
-    [NoInterfaceObject]
-    interface Coordinates {
+    interface GeolocationCoordinates {
       readonly attribute double latitude;
       readonly attribute double longitude;
       readonly attribute double? altitude;
@@ -103,10 +101,10 @@
 function errorCallback(error)
 {
   test(function() {
-    assert_equals(error.toString(), "[object PositionError]",
-        "PositionError.toString should result in '[object PositionError]' was: " +
+    assert_equals(error.toString(), "[object GeolocationPositionError]",
+        "error.toString should result in '[object GeolocationPositionError]' was: " +
         error.toString());
-  }, "PositionError toString");
+  }, "GeolocationPositionError toString");
 
   test(function() {
     assert_equals(error.PERMISSION_DENIED, 1,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/geolocation-API/idlharness.https.window.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/geolocation-API/idlharness.https.window.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/geolocation-API/idlharness.https.window.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/geolocation-API/idlharness.https.window.js	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,17 @@
+// META: script=/resources/WebIDLParser.js
+// META: script=/resources/idlharness.js
+
+// https://www.w3.org/TR/geolocation-API/
+
+idl_test(
+  ['geolocation-API'],
+  ['html'],
+  idl_array => {
+    self.audio = document.createElement('audio');
+    self.video = document.createElement('video');
+    idl_array.add_objects({
+      Navigator: ['navigator'],
+      Geolocation: ['navigator.geolocation'],
+    });
+  }
+);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/geolocation-API/idlharness.window.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/geolocation-API/idlharness.window.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/geolocation-API/idlharness.window.js	2019-09-13 05:13:31.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/geolocation-API/idlharness.window.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-// META: script=/resources/WebIDLParser.js
-// META: script=/resources/idlharness.js
-
-// https://www.w3.org/TR/geolocation-API/
-
-idl_test(
-  ['geolocation-API'],
-  ['html'],
-  idl_array => {
-    self.audio = document.createElement('audio');
-    self.video = document.createElement('video');
-    idl_array.add_objects({
-      Navigator: ['navigator'],
-      Geolocation: ['navigator.geolocation'],
-    });
-  }
-);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/geolocation-API/non-secure-contexts.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/geolocation-API/non-secure-contexts.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/geolocation-API/non-secure-contexts.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/geolocation-API/non-secure-contexts.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,82 @@
+<!DOCTYPE html>
+<meta charset="utf-8" />
+<title>Geolocation Test: non-secure contexts</title>
+<link rel="help" href="https://github.com/w3c/geolocation-api/pull/34" />
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  promise_test(() => {
+    return new Promise(resolve => {
+      let isAsync = true;
+      const successCallback = () => {
+        assert_unreached(
+          "successCallback must never be invoked in non-secure contexts."
+        );
+      };
+      const errorCallBack = () => {
+        isAsync = false;
+        resolve();
+      };
+      navigator.geolocation.getCurrentPosition(successCallback, errorCallBack);
+      assert_true(
+        isAsync,
+        "Expected the errorCallback to be called asynchronously."
+      );
+    });
+  }, "When in a non-secure context, getCurrentPosition()'s errorCallback is asynchronously called.");
+
+  promise_test(async () => {
+    return new Promise(resolve => {
+      let isAsync = true;
+      const successCallback = () => {
+        assert_unreached(
+          "successCallback must never be invoked in non-secure contexts."
+        );
+      };
+      const errorCallBack = () => {
+        isAsync = false;
+        resolve();
+      };
+      navigator.geolocation.watchPosition(successCallback, errorCallBack);
+      assert_true(isAsync, "errorCallback must be called asynchronously.");
+    });
+  }, "When in a non-secure context, watchPosition()'s errorCallback is asynchronously called.");
+
+  promise_test(async () => {
+    const positionErrorPromise = new Promise(errorCallBack => {
+      const successCallback = () => {
+        assert_unreached(
+          "successCallback must never be invoked in non-secure contexts."
+        );
+      };
+      navigator.geolocation.getCurrentPosition(successCallback, errorCallBack);
+    });
+    const positionError = await positionErrorPromise;
+    assert_equals(
+      positionError.code,
+      1,
+      "Expected the value for PERMISSION_DENIED, which is 1."
+    );
+  }, "When in a non-secure context, the getCurrentPosition() errorCallBack gets a PositionError with the correct error code.");
+
+  promise_test(async () => {
+    const positionErrorPromise = new Promise(errorCallBack => {
+      const successCallback = () => {
+        assert_unreached(
+          "successCallback must never be invoked in non-secure contexts."
+        );
+      };
+      const id = navigator.geolocation.watchPosition(
+        successCallback,
+        errorCallBack
+      );
+      assert_true(Number.isInteger(id), "Must return an identifier.");
+    });
+    const positionError = await positionErrorPromise;
+    assert_equals(
+      positionError.code,
+      1,
+      "Expected the value for PERMISSION_DENIED, which is 1."
+    );
+  }, "When in a non-secure context, the watchPosition() errorCallBack gets a PositionError with the correct error code.");
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/.github/workflows/pull_request.yml firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/.github/workflows/pull_request.yml
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/.github/workflows/pull_request.yml	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/.github/workflows/pull_request.yml	2019-09-15 11:33:23.000000000 +0000
@@ -2,9 +2,9 @@
 name: Synchronize the Pull Request Preview
 jobs:
   update-pr-preview:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v1.0.0
+    - uses: actions/checkout@v1
       with:
         ref: refs/heads/master
         fetch-depth: 1
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/.github/workflows/push-build-publish-documentation-website.yml firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/.github/workflows/push-build-publish-documentation-website.yml
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/.github/workflows/push-build-publish-documentation-website.yml	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/.github/workflows/push-build-publish-documentation-website.yml	2019-09-15 11:33:23.000000000 +0000
@@ -1,10 +1,15 @@
-on: push
+on:
+  push:
+    branches:
+      - master
 name: Build & Publish Documentation Website
 jobs:
   website-build-and-publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
     - name: website-build-and-publish
       uses: ./tools/docker/documentation
       env:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/.github/workflows/push-build-release-manifest.yml firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/.github/workflows/push-build-release-manifest.yml
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/.github/workflows/push-build-release-manifest.yml	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/.github/workflows/push-build-release-manifest.yml	2019-09-15 11:33:22.000000000 +0000
@@ -1,10 +1,15 @@
-on: push
+on:
+  push:
+    branches:
+      - master
 name: Build & Release Manifest
 jobs:
   manifest-build-and-tag:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
     - name: manifest-build-and-tag
       uses: ./tools/docker/github
       env:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/forms/autofocus/resources/child-iframe.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/forms/autofocus/resources/child-iframe.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/forms/autofocus/resources/child-iframe.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/forms/autofocus/resources/child-iframe.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<script src="/common/get-host-info.sub.js"></script>
+<iframe id="iframe" width="200" height="100"></iframe>
+
+<script>
+  iframe.src =
+    get_host_info().ORIGIN + "/html/semantics/forms/autofocus/resources/grand-child-autofocus.html";
+  window.addEventListener("message", event => {
+    if (event.data == "grand_child_loaded") {
+      parent.postMessage("ready", "*");
+    } else if (event.data == "report_focus_state") {
+      frames[0].postMessage("report_focus_state", "*");
+    } else if (event.data == "grand_child_is_focused" ||
+               event.data == "grand_child_is_not_focused") {
+      parent.postMessage(event.data, "*");
+    }
+  });
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/forms/autofocus/resources/grand-child-autofocus.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/forms/autofocus/resources/grand-child-autofocus.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/forms/autofocus/resources/grand-child-autofocus.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/forms/autofocus/resources/grand-child-autofocus.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<input id="target" value="This should be focused!" autofocus></input>
+
+<script>
+  let got_focus = false;
+  target.addEventListener("focus", () => got_focus = true);
+
+  window.addEventListener("load", () => {
+    parent.postMessage("grand_child_loaded", "*");
+  });
+
+  window.addEventListener("message", event => {
+    if (event.data == "report_focus_state") {
+      let msg = got_focus ? "grand_child_is_focused" : "grand_child_is_not_focused";
+      parent.postMessage(msg, "*");
+    }
+  });
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/forms/autofocus/same-origin-autofocus.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/forms/autofocus/same-origin-autofocus.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/forms/autofocus/same-origin-autofocus.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/forms/autofocus/same-origin-autofocus.html	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1,46 @@
+<!doctype html>
+<html>
+<head>
+<meta charset=utf-8>
+<meta name="assert" content="`autofocus` should work in the same origin iframe even if there is a cross-origin iframe between the parent and the same origin iframe">
+<title>autofocus in the same origin grand child iframe</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+</head>
+<body>
+  <h1>Autofocus should work in the same origin grand child iframe.</h1>
+  <iframe id="child" width="200" height="100"></iframe>
+  <script>
+    let parent_loaded = false;
+    let grand_child_loaded = false;
+
+    async_test(function(t) {
+      function pingChildIfBothFramesLoaded() {
+        if (parent_loaded && grand_child_loaded)
+          frames[0].postMessage("report_focus_state", "*");
+      }
+
+      window.addEventListener("load", t.step_func(event => {
+        parent_loaded = true;
+        pingChildIfBothFramesLoaded();
+      }));
+
+      window.addEventListener("message", t.step_func(event => {
+        if (event.data == "ready") {
+          grand_child_loaded = true;
+          pingChildIfBothFramesLoaded();
+        } else if (event.data == "grand_child_is_focused") {
+          t.done();
+        } else if (event.data == "grand_child_is_not_focused") {
+          assert_unreached("The iframe shouldn't get focus");
+        }
+      }));
+      document.getElementById("child").src =
+          get_host_info().HTTP_NOTSAMESITE_ORIGIN + "/html/semantics/forms/autofocus/resources/child-iframe.html";
+    }, "Autofocus should work in the same origin grand child iframe");
+  </script>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html	2019-09-15 11:33:27.000000000 +0000
@@ -21,6 +21,8 @@
 
 import { referrer as referrerRemoteRemote } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_remote";
 
+import { referrer as referrerRemoteSame } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_same";
+
 test(t => {
   assert_equals(
       referrerSame, "",
@@ -49,9 +51,9 @@
 
 test(t => {
   assert_equals(
-      referrerRemoteRemote, "",
-      "Referrer should not be sent for the remote-origin descendant script.");
-}, "Importing a remote-origin descendant script from a remote-origin " +
+      referrerRemoteSame, "",
+      "Referrer should not be sent for the same-origin descendant script.");
+}, "Importing a same-origin descendant script from a remote-origin " +
    "top-level script with the no-referrer policy.");
 
 </script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html	2019-09-15 11:33:26.000000000 +0000
@@ -21,6 +21,8 @@
 
 import { referrer as referrerRemoteRemote } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_remote";
 
+import { referrer as referrerRemoteSame } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_same";
+
 const origin = (new URL(location.href)).origin + "/";
 const remoteOrigin = "http://{{domains[www1]}}:{{ports[http][0]}}/";
 
@@ -57,6 +59,13 @@
 }, "Importing a remote-origin descendant script from a remote-origin " +
    "top-level script with the origin policy.");
 
+test(t => {
+  assert_equals(
+      referrerRemoteSame, remoteOrigin,
+      "Referrer should be sent for the same-origin descendant script.");
+}, "Importing a same-origin descendant script from a remote-origin " +
+   "top-level script with the origin policy.");
+
 </script>
 </body>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html	2019-09-15 11:33:27.000000000 +0000
@@ -21,6 +21,8 @@
 
 import { referrer as referrerRemoteRemote } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_remote";
 
+import { referrer as referrerRemoteSame } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_same";
+
 const origin = (new URL(location.href)).origin + "/";
 const remoteOrigin = "http://{{domains[www1]}}:{{ports[http][0]}}/";
 
@@ -37,7 +39,6 @@
       "Referrer should be sent for the remote-origin top-level script.");
 }, "Importing a remote-origin top-level script with the " +
    "origin-when-cross-origin policy.");
-
 test(t => {
   const scriptURL =
       new URL("resources/import-referrer-checker.sub.js", location.href)
@@ -46,7 +47,6 @@
       "Referrer should be sent for the same-origin descendant script.");
 }, "Importing a same-origin descendant script from a same-origin top-level " +
    "script with the origin-when-cross-origin policy.");
-
 test(t => {
   assert_equals(
       referrerSameRemote, origin,
@@ -61,6 +61,16 @@
 }, "Importing a remote-origin descendant script from a remote-origin " +
    "top-level script with the origin-when-cross-origin policy.");
 
+test(t => {
+  const scriptURL = new URL(
+    "html/semantics/scripting-1/the-script-element/module/resources/" +
+    "import-same-origin-referrer-checker-from-remote-origin.sub.js",
+    remoteOrigin);
+  assert_equals(referrerRemoteSame, scriptURL + "?name=remote_same",
+      "Referrer should be sent for the same-origin descendant script.");
+}, "Importing a same-origin descendant script from a remote-origin " +
+   "top-level script with the origin-when-cross-origin policy.");
+
 </script>
 </body>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html	2019-09-15 11:33:27.000000000 +0000
@@ -21,6 +21,10 @@
 
 import { referrer as referrerRemoteRemote } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_remote";
 
+import { referrer as referrerRemoteSame } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_same";
+
+const remoteOrigin = "http://{{domains[www1]}}:{{ports[http][0]}}/";
+
 test(t => {
   assert_equals(
       referrerSame, location.href,
@@ -57,6 +61,18 @@
 }, "Importing a remote-origin descendant script from a remote-origin " +
    "top-level script with the same-origin policy.");
 
+test(t => {
+  const scriptURL = new URL(
+    "html/semantics/scripting-1/the-script-element/module/resources/" +
+    "import-same-origin-referrer-checker-from-remote-origin.sub.js",
+    remoteOrigin);
+  assert_equals(
+      referrerRemoteSame, scriptURL + "?name=remote_same",
+      "Referrer should be sent for the same-origin descendant script " +
+      "even if it is imported from the script in the remote-origin.");
+}, "Importing a same-origin descendant script from a remote-origin " +
+   "top-level script with the same-origin policy.");
+
 </script>
 </body>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html	2019-09-15 11:33:28.000000000 +0000
@@ -21,6 +21,8 @@
 
 import { referrer as referrerRemoteRemote } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_remote";
 
+import { referrer as referrerRemoteSame } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_same";
+
 test(t => {
   assert_equals(
       referrerSame, location.href,
@@ -63,6 +65,17 @@
 }, "Importing a remote-origin descendant script from a remote-origin " +
    "top-level script with the unsafe-url policy.");
 
+test(t => {
+  const scriptURL =
+      "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/" +
+      "scripting-1/the-script-element/module/resources/" +
+      "import-same-origin-referrer-checker-from-remote-origin.sub.js";
+  assert_equals(
+      referrerRemoteSame, scriptURL + "?name=remote_same",
+      "Referrer should be sent for the same-origin descendant script.");
+}, "Importing a same-origin descendant script from a remote-origin " +
+   "top-level script with the unsafe-url policy.");
+
 </script>
 </body>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,2 @@
+import { referrer as referrerImport } from 'http://{{host}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/referrer-checker.py?name={{GET[name]}}';
+export const referrer = referrerImport;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers	2019-09-15 11:33:26.000000000 +0000
@@ -0,0 +1 @@
+Access-Control-Allow-Origin: *
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/imagebitmap-renderingcontext/tranferFromImageBitmap-TransferToImageBitmap-offscreen.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/imagebitmap-renderingcontext/tranferFromImageBitmap-TransferToImageBitmap-offscreen.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/imagebitmap-renderingcontext/tranferFromImageBitmap-TransferToImageBitmap-offscreen.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/imagebitmap-renderingcontext/tranferFromImageBitmap-TransferToImageBitmap-offscreen.html	2019-09-15 11:33:27.000000000 +0000
@@ -36,7 +36,7 @@
         var myCanvas2 = document.createElement('canvas');
         var myCtx2 = myCanvas2.getContext('bitmaprenderer');
         myCtx2.transferFromImageBitmap(bitmapCanvas.transferToImageBitmap());
-        testCanvas(myCanvas2, 0, 0, 0, 255);
+        testCanvas(myCanvas2, 0, 0, 0, 0);
     }
 
     var greenCanvas = document.createElement('canvas');
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini	2019-09-15 11:33:26.000000000 +0000
@@ -4,4 +4,4 @@
 
   [TestDriver actions: actions with key pressed]
     expected:
-      if os == "mac" and (product == "chrome" or product=="firefox"): FAIL
+      if product == "firefox" and os == "mac": FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/__dir__.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/__dir__.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/__dir__.ini	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/__dir__.ini	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,2 @@
+disabled:
+  if product == "chrome" and os == "mac": https://bugs.chromium.org/p/chromedriver/issues/detail?id=3114
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini	2019-09-15 11:33:27.000000000 +0000
@@ -1,7 +1,4 @@
 [elementPosition.html]
-  expected:
-    if os == "mac" and product == "chrome": TIMEOUT
-
   [TestDriver actions: element position]
     expected:
       if product == "safari": FAIL
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/background-fetch.idl firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/background-fetch.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/background-fetch.idl	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/background-fetch.idl	2019-09-15 11:33:27.000000000 +0000
@@ -16,7 +16,7 @@
 
 [Exposed=(Window,Worker)]
 interface BackgroundFetchManager {
-  Promise<BackgroundFetchRegistration> fetch(DOMString id, (RequestInfo or sequence<RequestInfo>) requests, optional BackgroundFetchOptions options);
+  Promise<BackgroundFetchRegistration> fetch(DOMString id, (RequestInfo or sequence<RequestInfo>) requests, optional BackgroundFetchOptions options = {});
   Promise<BackgroundFetchRegistration?> get(DOMString id);
   Promise<sequence<DOMString>> getIds();
 };
@@ -44,8 +44,8 @@
   attribute EventHandler onprogress;
 
   Promise<boolean> abort();
-  Promise<BackgroundFetchRecord> match(RequestInfo request, optional CacheQueryOptions options);
-  Promise<sequence<BackgroundFetchRecord>> matchAll(optional RequestInfo request, optional CacheQueryOptions options);
+  Promise<BackgroundFetchRecord> match(RequestInfo request, optional CacheQueryOptions options = {});
+  Promise<sequence<BackgroundFetchRecord>> matchAll(optional RequestInfo request, optional CacheQueryOptions options = {});
 };
 
 enum BackgroundFetchResult { "", "success", "failure" };
@@ -72,8 +72,9 @@
   readonly attribute Promise<Response> responseReady;
 };
 
-[Constructor(DOMString type, BackgroundFetchEventInit init), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface BackgroundFetchEvent : ExtendableEvent {
+  constructor(DOMString type, BackgroundFetchEventInit init);
   readonly attribute BackgroundFetchRegistration registration;
 };
 
@@ -81,7 +82,8 @@
   required BackgroundFetchRegistration registration;
 };
 
-[Constructor(DOMString type, BackgroundFetchEventInit init), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface BackgroundFetchUpdateUIEvent : BackgroundFetchEvent {
-  Promise<void> updateUI(optional BackgroundFetchUIOptions options);
+  constructor(DOMString type, BackgroundFetchEventInit init);
+  Promise<void> updateUI(optional BackgroundFetchUIOptions options = {});
 };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/FileAPI.idl firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/FileAPI.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/FileAPI.idl	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/FileAPI.idl	2019-09-15 11:33:27.000000000 +0000
@@ -3,10 +3,10 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: File API (https://w3c.github.io/FileAPI/)
 
-[Constructor(optional sequence<BlobPart> blobParts,
-             optional BlobPropertyBag options = {}),
- Exposed=(Window,Worker), Serializable]
+[Exposed=(Window,Worker), Serializable]
 interface Blob {
+  constructor(optional sequence<BlobPart> blobParts,
+              optional BlobPropertyBag options = {});
 
   readonly attribute unsigned long long size;
   readonly attribute DOMString type;
@@ -31,11 +31,11 @@
 
 typedef (BufferSource or Blob or USVString) BlobPart;
 
-[Constructor(sequence<BlobPart> fileBits,
-             USVString fileName,
-             optional FilePropertyBag options = {}),
- Exposed=(Window,Worker), Serializable]
+[Exposed=(Window,Worker), Serializable]
 interface File : Blob {
+  constructor(sequence<BlobPart> fileBits,
+              USVString fileName,
+              optional FilePropertyBag options = {});
   readonly attribute DOMString name;
   readonly attribute long long lastModified;
 };
@@ -50,9 +50,9 @@
   readonly attribute unsigned long length;
 };
 
-[Constructor, Exposed=(Window,Worker)]
+[Exposed=(Window,Worker)]
 interface FileReader: EventTarget {
-
+  constructor();
   // async read methods
   void readAsArrayBuffer(Blob blob);
   void readAsBinaryString(Blob blob);
@@ -82,8 +82,9 @@
   attribute EventHandler onloadend;
 };
 
-[Constructor, Exposed=(DedicatedWorker,SharedWorker)]
+[Exposed=(DedicatedWorker,SharedWorker)]
 interface FileReaderSync {
+  constructor();
   // Synchronously return strings
 
   ArrayBuffer readAsArrayBuffer(Blob blob);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/geolocation-API.idl firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/geolocation-API.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/geolocation-API.idl	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/geolocation-API.idl	2019-09-15 11:33:27.000000000 +0000
@@ -1,28 +1,28 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into reffy-reports
 // (https://github.com/tidoust/reffy-reports)
-// Source: Geolocation API Specification 2nd Edition (https://www.w3.org/TR/geolocation-API/)
+// Source: Geolocation API Specification (https://w3c.github.io/geolocation-api/)
 
 partial interface Navigator {
-  readonly attribute Geolocation geolocation;
+  [SameObject] readonly attribute Geolocation geolocation;
 };
 
-[NoInterfaceObject]
+[Exposed=Window]
 interface Geolocation {
   void getCurrentPosition(PositionCallback successCallback,
                           optional PositionErrorCallback errorCallback,
-                          optional PositionOptions options);
+                          optional PositionOptions options = {});
 
   long watchPosition(PositionCallback successCallback,
                      optional PositionErrorCallback errorCallback,
-                     optional PositionOptions options);
+                     optional PositionOptions options = {});
 
   void clearWatch(long watchId);
 };
 
-callback PositionCallback = void (Position position);
+callback PositionCallback = void (GeolocationPosition position);
 
-callback PositionErrorCallback = void (PositionError positionError);
+callback PositionErrorCallback = void (GeolocationPositionError positionError);
 
 dictionary PositionOptions {
   boolean enableHighAccuracy = false;
@@ -30,14 +30,14 @@
   [Clamp] unsigned long maximumAge = 0;
 };
 
-[NoInterfaceObject]
-interface Position {
-  readonly attribute Coordinates coords;
+[Exposed=Window, SecureContext]
+interface GeolocationPosition {
+  readonly attribute GeolocationCoordinates coords;
   readonly attribute DOMTimeStamp timestamp;
 };
 
-[NoInterfaceObject]
-interface Coordinates {
+[Exposed=Window, SecureContext]
+interface GeolocationCoordinates {
   readonly attribute double latitude;
   readonly attribute double longitude;
   readonly attribute double? altitude;
@@ -47,8 +47,8 @@
   readonly attribute double? speed;
 };
 
-[NoInterfaceObject]
-interface PositionError {
+[Exposed=Window]
+interface GeolocationPositionError {
   const unsigned short PERMISSION_DENIED = 1;
   const unsigned short POSITION_UNAVAILABLE = 2;
   const unsigned short TIMEOUT = 3;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/orientation-event.idl firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/orientation-event.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/orientation-event.idl	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/orientation-event.idl	2019-09-15 11:33:27.000000000 +0000
@@ -1,68 +1,85 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into reffy-reports
 // (https://github.com/tidoust/reffy-reports)
-// Source: DeviceOrientation Event Specification (https://w3c.github.io/deviceorientation/spec-source-orientation.html)
+// Source: DeviceOrientation Event Specification (https://w3c.github.io/deviceorientation/)
 
 partial interface Window {
-      attribute EventHandler ondeviceorientation;
-    };
+    [SecureContext] attribute EventHandler ondeviceorientation;
+};
 
-    [Constructor(DOMString type, optional DeviceOrientationEventInit eventInitDict), Exposed=Window]
-    interface DeviceOrientationEvent : Event {
-      readonly attribute double? alpha;
-      readonly attribute double? beta;
-      readonly attribute double? gamma;
-      readonly attribute boolean absolute;
-    };
-
-    dictionary DeviceOrientationEventInit : EventInit {
-      double? alpha = null;
-      double? beta = null;
-      double? gamma = null;
-      boolean absolute = false;
-    };
+[Constructor(DOMString type, optional DeviceOrientationEventInit eventInitDict = {}), Exposed=Window, SecureContext]
+interface DeviceOrientationEvent : Event {
+    readonly attribute double? alpha;
+    readonly attribute double? beta;
+    readonly attribute double? gamma;
+    readonly attribute boolean absolute;
+
+    static Promise<PermissionState> requestPermission();
+};
+
+dictionary DeviceOrientationEventInit : EventInit {
+    double? alpha = null;
+    double? beta = null;
+    double? gamma = null;
+    boolean absolute = false;
+};
+
+enum PermissionState {
+    "granted",
+    "denied",
+};
 
 partial interface Window {
-      attribute EventHandler ondevicemotion;
-    };
+    [SecureContext] attribute EventHandler ondeviceorientationabsolute;
+};
 
-    [NoInterfaceObject]
-    interface DeviceAcceleration {
-      readonly attribute double? x;
-      readonly attribute double? y;
-      readonly attribute double? z;
-    };
-
-    [NoInterfaceObject]
-    interface DeviceRotationRate {
-      readonly attribute double? alpha;
-      readonly attribute double? beta;
-      readonly attribute double? gamma;
-    };
-
-    [Constructor(DOMString type, optional DeviceMotionEventInit eventInitDict), Exposed=Window]
-    interface DeviceMotionEvent : Event {
-      readonly attribute DeviceAcceleration? acceleration;
-      readonly attribute DeviceAcceleration? accelerationIncludingGravity;
-      readonly attribute DeviceRotationRate? rotationRate;
-      readonly attribute double interval;
-    };
-
-    dictionary DeviceAccelerationInit {
-      double? x = null;
-      double? y = null;
-      double? z = null;
-    };
-
-    dictionary DeviceRotationRateInit {
-      double? alpha = null;
-      double? beta = null;
-      double? gamma = null;
-    };
-
-    dictionary DeviceMotionEventInit : EventInit {
-      DeviceAccelerationInit? acceleration;
-      DeviceAccelerationInit? accelerationIncludingGravity;
-      DeviceRotationRateInit? rotationRate;
-      double interval = 0;
-    };
+partial interface Window {
+    attribute EventHandler oncompassneedscalibration;
+};
+
+partial interface Window {
+    [SecureContext] attribute EventHandler ondevicemotion;
+};
+
+[SecureContext]
+interface DeviceMotionEventAcceleration {
+    readonly attribute double? x;
+    readonly attribute double? y;
+    readonly attribute double? z;
+};
+
+[SecureContext]
+interface DeviceMotionEventRotationRate {
+    readonly attribute double? alpha;
+    readonly attribute double? beta;
+    readonly attribute double? gamma;
+};
+
+[Constructor(DOMString type, optional DeviceMotionEventInit eventInitDict = {}), Exposed=Window, SecureContext]
+interface DeviceMotionEvent : Event {
+    readonly attribute DeviceMotionEventAcceleration? acceleration;
+    readonly attribute DeviceMotionEventAcceleration? accelerationIncludingGravity;
+    readonly attribute DeviceMotionEventRotationRate? rotationRate;
+    readonly attribute double interval;
+
+    static Promise<PermissionState> requestPermission();
+};
+
+dictionary DeviceMotionEventAccelerationInit {
+    double? x = null;
+    double? y = null;
+    double? z = null;
+};
+
+dictionary DeviceMotionEventRotationRateInit {
+    double? alpha = null;
+    double? beta = null;
+    double? gamma = null;
+};
+
+dictionary DeviceMotionEventInit : EventInit {
+    DeviceMotionEventAccelerationInit acceleration;
+    DeviceMotionEventAccelerationInit accelerationIncludingGravity;
+    DeviceMotionEventRotationRateInit rotationRate;
+    double interval = 0;
+};
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/presentation-api.idl firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/presentation-api.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/presentation-api.idl	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/presentation-api.idl	2019-09-15 11:33:26.000000000 +0000
@@ -19,10 +19,10 @@
   readonly attribute PresentationReceiver? receiver;
 };
 
-[Constructor(USVString url),
- Constructor(sequence<USVString> urls),
- SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface PresentationRequest : EventTarget {
+  constructor(USVString url);
+  constructor(sequence<USVString> urls);
   Promise<PresentationConnection> start();
   Promise<PresentationConnection> reconnect(USVString presentationId);
   Promise<PresentationAvailability> getAvailability();
@@ -37,9 +37,9 @@
   attribute EventHandler onchange;
 };
 
-[Constructor(DOMString type, PresentationConnectionAvailableEventInit eventInitDict),
- SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface PresentationConnectionAvailableEvent : Event {
+  constructor(DOMString type, PresentationConnectionAvailableEventInit eventInitDict);
   [SameObject] readonly attribute PresentationConnection connection;
 };
 
@@ -64,17 +64,17 @@
   // Communication
   attribute BinaryType binaryType;
   attribute EventHandler onmessage;
-  void send(DOMString message);
-  void send(Blob data);
-  void send(ArrayBuffer data);
-  void send(ArrayBufferView data);
+  void send (DOMString message);
+  void send (Blob data);
+  void send (ArrayBuffer data);
+  void send (ArrayBufferView data);
 };
 
 enum PresentationConnectionCloseReason { "error", "closed", "wentaway" };
 
-[Constructor(DOMString type, PresentationConnectionCloseEventInit eventInitDict),
- SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface PresentationConnectionCloseEvent : Event {
+  constructor(DOMString type, PresentationConnectionCloseEventInit eventInitDict);
   readonly attribute PresentationConnectionCloseReason reason;
   readonly attribute DOMString message;
 };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/push-api.idl firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/push-api.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/push-api.idl	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/push-api.idl	2019-09-15 11:33:28.000000000 +0000
@@ -64,8 +64,9 @@
   attribute EventHandler onpushsubscriptionchange;
 };
 
-[Constructor(DOMString type, optional PushEventInit eventInitDict = {}), Exposed=ServiceWorker, SecureContext]
+[Exposed=ServiceWorker, SecureContext]
 interface PushEvent : ExtendableEvent {
+  constructor(DOMString type, optional PushEventInit eventInitDict = {});
   readonly attribute PushMessageData? data;
 };
 
@@ -75,8 +76,9 @@
   PushMessageDataInit data;
 };
 
-[Constructor(DOMString type, optional PushSubscriptionChangeEventInit eventInitDict = {}), Exposed=ServiceWorker, SecureContext]
+[Exposed=ServiceWorker, SecureContext]
 interface PushSubscriptionChangeEvent : ExtendableEvent {
+  constructor(DOMString type, optional PushSubscriptionChangeEventInit eventInitDict = {});
   readonly attribute PushSubscription? newSubscription;
   readonly attribute PushSubscription? oldSubscription;
 };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/screen-capture.idl firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/screen-capture.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/screen-capture.idl	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/screen-capture.idl	2019-09-15 11:33:27.000000000 +0000
@@ -4,43 +4,43 @@
 // Source: Screen Capture (https://w3c.github.io/mediacapture-screen-share/)
 
 partial interface MediaDevices {
-    Promise<MediaStream> getDisplayMedia (optional DisplayMediaStreamConstraints constraints = {});
+  Promise<MediaStream> getDisplayMedia(optional DisplayMediaStreamConstraints constraints = {});
 };
 
 dictionary DisplayMediaStreamConstraints {
-    (boolean or MediaTrackConstraints) video = true;
-    (boolean or MediaTrackConstraints) audio = false;
+  (boolean or MediaTrackConstraints) video = true;
+  (boolean or MediaTrackConstraints) audio = false;
 };
 
 partial dictionary MediaTrackSupportedConstraints {
-             boolean displaySurface = true;
-             boolean logicalSurface = true;
-             boolean cursor = true;
-             boolean restrictOwnAudio = true;
+  boolean displaySurface = true;
+  boolean logicalSurface = true;
+  boolean cursor = true;
+  boolean restrictOwnAudio = true;
 };
 
 partial dictionary MediaTrackConstraintSet {
-             ConstrainDOMString displaySurface;
-             ConstrainBoolean logicalSurface;
-             ConstrainDOMString cursor;
-             ConstrainBoolean restrictOwnAudio;
+  ConstrainDOMString displaySurface;
+  ConstrainBoolean logicalSurface;
+  ConstrainDOMString cursor;
+  ConstrainBoolean restrictOwnAudio;
 };
 
 partial dictionary MediaTrackSettings {
-             DOMString displaySurface;
-             boolean logicalSurface;
-             DOMString cursor;
+  DOMString displaySurface;
+  boolean logicalSurface;
+  DOMString cursor;
 };
 
 enum DisplayCaptureSurfaceType {
-    "monitor",
-    "window",
-    "application",
-    "browser"
+  "monitor",
+  "window",
+  "application",
+  "browser"
 };
 
 enum CursorCaptureConstraint {
-    "never",
-    "always",
-    "motion"
+  "never",
+  "always",
+  "motion"
 };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/service-workers.idl firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/service-workers.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/service-workers.idl	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/service-workers.idl	2019-09-15 11:33:27.000000000 +0000
@@ -155,8 +155,9 @@
   "all"
 };
 
-[Constructor(DOMString type, optional ExtendableEventInit eventInitDict = {}), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface ExtendableEvent : Event {
+  constructor(DOMString type, optional ExtendableEventInit eventInitDict = {});
   void waitUntil(Promise<any> f);
 };
 
@@ -164,8 +165,9 @@
   // Defined for the forward compatibility across the derived events
 };
 
-[Constructor(DOMString type, FetchEventInit eventInitDict), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface FetchEvent : ExtendableEvent {
+  constructor(DOMString type, FetchEventInit eventInitDict);
   [SameObject] readonly attribute Request request;
   readonly attribute Promise<any> preloadResponse;
   readonly attribute DOMString clientId;
@@ -183,8 +185,9 @@
   DOMString replacesClientId = "";
 };
 
-[Constructor(DOMString type, optional ExtendableMessageEventInit eventInitDict = {}), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface ExtendableMessageEvent : ExtendableEvent {
+  constructor(DOMString type, optional ExtendableMessageEventInit eventInitDict = {});
   readonly attribute any data;
   readonly attribute USVString origin;
   readonly attribute DOMString lastEventId;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/speech-api.idl firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/speech-api.idl
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/interfaces/speech-api.idl	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/interfaces/speech-api.idl	2019-09-15 11:33:27.000000000 +0000
@@ -3,8 +3,10 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: Web Speech API (https://w3c.github.io/speech-api/)
 
-[Exposed=Window, Constructor]
+[Exposed=Window]
 interface SpeechRecognition : EventTarget {
+    constructor();
+
     // recognition parameters
     attribute SpeechGrammarList grammars;
     attribute DOMString lang;
@@ -42,9 +44,9 @@
     "language-not-supported"
 };
 
-[Exposed=Window,
- Constructor(DOMString type, SpeechRecognitionErrorEventInit eventInitDict)]
+[Exposed=Window]
 interface SpeechRecognitionErrorEvent : Event {
+    constructor(DOMString type, SpeechRecognitionErrorEventInit eventInitDict);
     readonly attribute SpeechRecognitionErrorCode error;
     readonly attribute DOMString message;
 };
@@ -77,9 +79,9 @@
 };
 
 // A full response, which could be interim or final, part of a continuous response or not
-[Exposed=Window,
- Constructor(DOMString type, SpeechRecognitionEventInit eventInitDict)]
+[Exposed=Window]
 interface SpeechRecognitionEvent : Event {
+    constructor(DOMString type, SpeechRecognitionEventInit eventInitDict);
     readonly attribute unsigned long resultIndex;
     readonly attribute SpeechRecognitionResultList results;
 };
@@ -97,8 +99,9 @@
 };
 
 // The object representing a speech grammar collection
-[Exposed=Window, Constructor]
+[Exposed=Window]
 interface SpeechGrammarList {
+    constructor();
     readonly attribute unsigned long length;
     getter SpeechGrammar item(unsigned long index);
     void addFromURI(DOMString src,
@@ -126,9 +129,10 @@
     [SameObject] readonly attribute SpeechSynthesis speechSynthesis;
 };
 
-[Exposed=Window,
-  Constructor(optional DOMString text)]
+[Exposed=Window]
 interface SpeechSynthesisUtterance : EventTarget {
+    constructor(optional DOMString text);
+
     attribute DOMString text;
     attribute DOMString lang;
     attribute SpeechSynthesisVoice? voice;
@@ -145,9 +149,9 @@
     attribute EventHandler onboundary;
 };
 
-[Exposed=Window,
- Constructor(DOMString type, SpeechSynthesisEventInit eventInitDict)]
+[Exposed=Window]
 interface SpeechSynthesisEvent : Event {
+    constructor(DOMString type, SpeechSynthesisEventInit eventInitDict);
     readonly attribute SpeechSynthesisUtterance utterance;
     readonly attribute unsigned long charIndex;
     readonly attribute unsigned long charLength;
@@ -178,9 +182,9 @@
     "not-allowed",
 };
 
-[Exposed=Window,
- Constructor(DOMString type, SpeechSynthesisErrorEventInit eventInitDict)]
+[Exposed=Window]
 interface SpeechSynthesisErrorEvent : SpeechSynthesisEvent {
+    constructor(DOMString type, SpeechSynthesisErrorEventInit eventInitDict);
     readonly attribute SpeechSynthesisErrorCode error;
 };
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/lint.whitelist firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/lint.whitelist
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/lint.whitelist	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/lint.whitelist	2019-09-15 11:33:27.000000000 +0000
@@ -827,3 +827,19 @@
 MISSING DEPENDENCY: shape-detection/resources/shapedetection-helpers.js
 MISSING DEPENDENCY: webxr/resources/webxr_util.js
 MISSING DEPENDENCY: contacts/resources/helpers.js
+
+# Tests that are false positives for using Ahem as a system font
+AHEM SYSTEM FONT: acid/acid3/test.html
+AHEM SYSTEM FONT: resource-timing/resources/all_resource_types.htm
+AHEM SYSTEM FONT: resource-timing/resources/iframe-reload-TAO.sub.html
+
+# These tests are imported from mozilla-central and can't be modified in WPT.
+# They do load Ahem as a web font, but they use their own copy which trips the
+# lint rule. Basically false positives.
+AHEM SYSTEM FONT: css/vendor-imports/mozilla/mozilla-central-reftests/*
+
+# TODO: The following should be deleted along with the Ahem web font cleanup
+# PR (https://github.com/web-platform-tests/wpt/pull/18702)
+AHEM SYSTEM FONT: infrastructure/assumptions/ahem-ref.html
+AHEM SYSTEM FONT: infrastructure/assumptions/ahem.html
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/direction/direction-009-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/direction/direction-009-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/direction/direction-009-ref.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/direction/direction-009-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8"/>
     <title>RTL ms lquote="X" rquote="p"</title>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
     <style>
       math {
           font: 25px/1 Ahem;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-bar-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-bar-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-bar-001.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-bar-001.html	2019-09-15 11:33:28.000000000 +0000
@@ -25,10 +25,8 @@
     </style>
     <script src="/common/reftest-wait.js"></script>
     <script>
-      window.addEventListener("load", () => {
-        // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-        requestAnimationFrame(() => { document.fonts.ready.then(adjustPositionOfFraction); });
-      });
+      window.addEventListener("load", () => { document.fonts.ready.then(adjustPositionOfFraction); });
+
       function adjustPositionOfFraction()
       {
         requestAnimationFrame(() => {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-002.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-linethickness-002.html	2019-09-15 11:33:27.000000000 +0000
@@ -28,10 +28,7 @@
       }
 
       setup({ explicit_done: true });
-      window.addEventListener("load", function() {
-        // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-        requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-      });
+      window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
       function runTests() {
         var defaultRuleThickness = 100;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-1.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-1.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-1.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-1.html	2019-09-15 11:33:26.000000000 +0000
@@ -62,10 +62,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-2.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-2.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-2.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-2.html	2019-09-15 11:33:27.000000000 +0000
@@ -46,10 +46,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html	2019-09-15 11:33:27.000000000 +0000
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html	2019-09-15 11:33:28.000000000 +0000
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html	2019-09-15 11:33:28.000000000 +0000
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html	2019-09-15 11:33:27.000000000 +0000
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html	2019-09-15 11:33:27.000000000 +0000
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html	2019-09-15 11:33:26.000000000 +0000
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html	2019-09-15 11:33:27.000000000 +0000
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html	2019-09-15 11:33:28.000000000 +0000
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html	2019-09-15 11:33:28.000000000 +0000
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html	2019-09-15 11:33:27.000000000 +0000
@@ -28,10 +28,7 @@
 </style>
 <script type="text/javascript">
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
   function runTests()
   {
       ["Mrow", "Sqrt", "Style", "Error", "Phantom", "Math", "Menclose", "Mpadded"].forEach((tag) => {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/operators/embellished-operator-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/operators/embellished-operator-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/operators/embellished-operator-001.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/operators/embellished-operator-001.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,6 +11,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
+<script src="/mathml/support/box-navigation.js"></script>
 <style>
   /* Default spacing of operator 'X' is 0.2777777777777778em so quite different
      from the measured/specified 0em and 1em. */
@@ -27,11 +28,20 @@
       color: blue !important;
       background: blue !important;
   }
+  .oof1 {
+      position: absolute;
+  }
+  .oof2 {
+      position: fixed;
+  }
+  .nobox {
+      display: none;
+  }
 </style>
 <script>
   function spaceBeforeElement(id) {
       var element = document.getElementById(id);
-      var mnBefore = element.previousElementSibling;
+      var mnBefore = previousInFlowSibling(element);
       return element.getBoundingClientRect().left - mnBefore.getBoundingClientRect().right;
   }
 
@@ -51,15 +61,27 @@
       ["mrow", "mstyle", "mphantom", "mpadded"].forEach(tag => {
           test(function() {
               assert_true(MathMLFeatureDetection.has_operator_spacing());
-              assert_approx_equals(spaceBeforeElement(`${tag}-op`), 2 * emToPx, epsilon);
-              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-op`), 0, epsilon);
+              assert_approx_equals(spaceBeforeElement(`${tag}-op-1`), 2 * emToPx, epsilon);
+              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-op-1`), 0, epsilon);
           }, `${tag} (embellished operator)`);
 
           test(function() {
               assert_true(MathMLFeatureDetection.has_operator_spacing());
-              assert_approx_equals(spaceBeforeElement(`${tag}-nonop`), 0, epsilon);
-              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-nonop`), 2 * emToPx, epsilon);
+              assert_approx_equals(spaceBeforeElement(`${tag}-op-2`), 2 * emToPx, epsilon);
+              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-op-2`), 0, epsilon);
+          }, `${tag} (embellished operator, from in-flow children)`);
+
+          test(function() {
+              assert_true(MathMLFeatureDetection.has_operator_spacing());
+              assert_approx_equals(spaceBeforeElement(`${tag}-nonop-1`), 0, epsilon);
+              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-nonop-1`), 2 * emToPx, epsilon);
           }, `${tag} (not embellished operator)`);
+
+          test(function() {
+              assert_true(MathMLFeatureDetection.has_operator_spacing());
+              assert_approx_equals(spaceBeforeElement(`${tag}-nonop-2`), 0, epsilon);
+              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-nonop-2`), 2 * emToPx, epsilon);
+          }, `${tag} (not embellished operator, from in-flow children)`);
       });
 
       done();
@@ -68,32 +90,68 @@
 </head>
 <body>
   <div id="log"></div>
+  <!-- mrow is an embellished operator if its in-flow children consist
+       of one embellished operator and zero or more space-like elements. -->
+  <p>
+    <math>
+      <mn>X</mn>
+      <mrow id="mrow-op-1" class="testedElement">
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mtext class="space-like">X</mtext>
+      </mrow>
+      <mn>X</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn>X</mn>
+      <mrow id="mrow-nonop-1" class="testedElement">
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn>X</mn> <!-- "mn" is not space-like -->
+      </mrow>
+      <mn>X</mn>
+    </math>
+  </p>
   <p>
     <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       <mn>X</mn>
-      <mrow id="mrow-op" class="testedElement">
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mrow id="mrow-op-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mtext class="space-like">X</mtext>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       </mrow>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
     </math>
   </p>
   <p>
     <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       <mn>X</mn>
-      <mrow id="mrow-nonop" class="testedElement">
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mrow id="mrow-nonop-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mn>X</mn> <!-- "mn" is not space-like -->
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       </mrow>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
     </math>
   </p>
-  <!-- mstyle is an embellished operator if its children consist
+  <!-- mstyle is an embellished operator if its in-flow children consist
        of one embellished operator and zero or more space-like elements. -->
   <p>
     <math>
       <mn>X</mn>
-      <mstyle id="mstyle-op" class="testedElement">
+      <mstyle id="mstyle-op-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
       </mstyle>
       <mn>X</mn>
@@ -102,19 +160,51 @@
   <p>
     <math>
       <mn>X</mn>
-      <mstyle id="mstyle-nonop" class="testedElement">
+      <mstyle id="mstyle-nonop-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
         <mn>X</mn> <!-- "mn" is not space-like -->
       </mstyle>
       <mn>X</mn>
     </math>
   </p>
-  <!-- mphantom is an embellished operator if its children consist
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mstyle id="mstyle-op-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mstyle>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mstyle id="mstyle-nonop-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn> <!-- "mn" is not space-like -->
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mstyle>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <!-- mphantom is an embellished operator if its in-flow children consist
        of one embellished operator and zero or more space-like elements. -->
   <p>
     <math>
       <mn>X</mn>
-      <mphantom id="mphantom-op" class="testedElement">
+      <mphantom id="mphantom-op-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
       </mphantom>
       <mn>X</mn>
@@ -123,32 +213,96 @@
   <p>
     <math>
       <mn>X</mn>
-      <mphantom id="mphantom-nonop" class="testedElement">
+      <mphantom id="mphantom-nonop-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
         <mn>X</mn> <!-- "mn" is not space-like -->
       </mphantom>
       <mn>X</mn>
     </math>
   </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mphantom id="mphantom-op-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mphantom>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mphantom id="mphantom-nonop-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn> <!-- "mn" is not space-like -->
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mphantom>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
   <!-- mpadded is an embellished operator if its children consist
        of one embellished operator and zero or more space-like elements. -->
   <p>
     <math>
       <mn>X</mn>
-      <mpadded id="mpadded-op" class="testedElement">
+      <mpadded id="mpadded-op-1" class="testedElement">
+        <mo lspace="2em" rspace="0em">X</mo>
+      </mpadded>
+      <mn>X</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn>X</mn>
+      <mpadded id="mpadded-nonop-1" class="testedElement">
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn>X</mn> <!-- "mn" is not space-like -->
+      </mpadded>
+      <mn>X</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mpadded id="mpadded-op-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       </mpadded>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
     </math>
   </p>
   <p>
     <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       <mn>X</mn>
-      <mpadded id="mpadded-nonop" class="testedElement">
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mpadded id="mpadded-nonop-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
         <mn>X</mn> <!-- "mn" is not space-like -->
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       </mpadded>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
       <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
     </math>
   </p>
 </body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/operators/embellished-operator-002.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/operators/embellished-operator-002.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/operators/embellished-operator-002.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/operators/embellished-operator-002.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,6 +11,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
+<script src="/mathml/support/box-navigation.js"></script>
 <style>
   /* Default spacing of operator 'X' is 0.2777777777777778em so quite different
      from the measured/specified 0em and 1em. */
@@ -30,10 +31,19 @@
       color: blue !important;
       background: blue !important;
   }
+  .oof1 {
+      position: absolute;
+  }
+  .oof2 {
+      position: fixed;
+  }
+  .nobox {
+      display: none;
+  }
 </style>
 <script>
   function spaceBeforeElement(element) {
-      var mnBefore = element.previousElementSibling;
+      var mnBefore = previousInFlowSibling(element);
       return element.getBoundingClientRect().left - mnBefore.getBoundingClientRect().right;
   }
 
@@ -55,8 +65,20 @@
            test(function() {
                assert_true(MathMLFeatureDetection.has_operator_spacing());
                var element = document.getElementsByTagName(tag)[1];
+               assert_approx_equals(spaceBeforeElement(element), 2 * emToPx, epsilon);
+           }, `${tag} (embellished operator, from in-flow children)`);
+
+           test(function() {
+               assert_true(MathMLFeatureDetection.has_operator_spacing());
+               var element = document.getElementsByTagName(tag)[2];
                assert_approx_equals(spaceBeforeElement(element), 0, epsilon);
            }, `${tag} (not embellished operator)`);
+
+           test(function() {
+               assert_true(MathMLFeatureDetection.has_operator_spacing());
+               var element = document.getElementsByTagName(tag)[3];
+               assert_approx_equals(spaceBeforeElement(element), 0, epsilon);
+           }, `${tag} (not embellished operator, from in-flow children)`);
       });
       done();
   }
@@ -66,7 +88,8 @@
   <div id="log"></div>
   <!-- <msub>, <msup>, <msubsup>, <munder>, <mover>, <munderover>,
        <mmultiscripts>, <mfrac>, <semantics> or <maction> are embellished
-       operators if their first child exists and is an embellished operator -->
+       operators if their first in-flow
+       child exists and is an embellished operator -->
   <p>
     <math>
       <mn>X</mn>
@@ -172,9 +195,190 @@
       <mn>X</mn>
     </math>
   </p>
+
+  <!-- Only in-flow children affect determination of embellished operators. -->
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msub class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msub>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msup class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msubsup class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msubsup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munder class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munder>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mover class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munderover class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munderover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mmultiscripts class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mmultiscripts>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mfrac class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mfrac>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <maction class="testedElement" actiontype="statusline">
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>STATUS MESSAGE</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </maction>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <semantics class="testedElement">
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <annotation>TEXT ANNOTATION</annotation>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </semantics>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+
   <!-- <msub>, <msup>, <msubsup>, <munder>, <mover>, <munderover>,
        <mmultiscripts>, <mfrac>, <semantics> or <maction> are not embellished
-       operators if their first child is not an embellished operator -->
+       operators if their first in-flow child is not an embellished operator -->
   <p>
     <math>
       <mn>X</mn>
@@ -282,5 +486,190 @@
       <mn>X</mn>
     </math>
   </p>
+
+  <!-- Only in-flow children affect determination of embellished operators. -->
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msub class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msub>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msup class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msubsup class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msubsup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munder class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munder>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mover class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munderover class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munderover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mmultiscripts class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mmultiscripts>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mfrac class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mfrac>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <maction class="testedElement" actiontype="statusline">
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">STATUS MESSAGE</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </maction>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <semantics class="testedElement">
+        <mrow>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mn>X</mn>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mo lspace="2em" rspace="0em">X</mo>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </mrow>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <annotation>TEXT ANNOTATION</annotation>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </semantics>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+
 </body>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/operators/mo-axis-height-1.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/operators/mo-axis-height-1.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/operators/mo-axis-height-1.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/operators/mo-axis-height-1.html	2019-09-15 11:33:27.000000000 +0000
@@ -25,10 +25,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/radicals/root-parameters-1.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/radicals/root-parameters-1.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/radicals/root-parameters-1.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/radicals/root-parameters-1.html	2019-09-15 11:33:28.000000000 +0000
@@ -50,10 +50,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/cramped-001.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/cramped-001.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/cramped-001.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/cramped-001.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,453 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Cramped elements</title>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cramped-elements">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#subscripts-and-superscripts-msub-msup-msubsup">
+<meta name="assert" content="Verify definition of cramped elements.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/mathml/support/feature-detection.js"></script>
+<script src="/mathml/support/box-navigation.js"></script>
+<style>
+  math {
+      font-family: superscriptshiftupcramped5000;
+  }
+  math, math * {
+      font-size: 10px;
+      background: lightyellow;
+  }
+  @font-face {
+    font-family: superscriptshiftupcramped5000;
+    src: url("/fonts/math/scripts-superscriptshiftupcramped5000.woff");
+  }
+  .testedElement *:first-child {
+      background: lightblue;
+  }
+  .testedElement *:last-child {
+      background: pink;
+  }
+</style>
+<script>
+  function assert_cramped(id, expected, name) {
+      const emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
+      const superscriptshiftupcramped = 5000 * emToPx;
+      var container = document.getElementById(id);
+      var msup = container.getElementsByClassName("testedElement")[0];
+      var base = firstInFlowChild(msup);
+      var script = nextInFlowSibling(base);
+      var shift = base.getBoundingClientRect().bottom - script.getBoundingClientRect().bottom;
+      if (expected)
+          assert_greater_than(shift, superscriptshiftupcramped / 2, `${name || id} should be cramped`);
+      else
+          assert_less_than(shift, superscriptshiftupcramped / 2, `${name || id} should not be cramped`);
+  }
+
+  setup({ explicit_done: true });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
+
+  function runTests() {
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("math-001", false);
+          assert_cramped("mrow-001", false, "mrow");
+      }, "child of non-cramped element");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mrow-002", true);
+      }, "child of cramped element");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msqrt-001", true);
+      }, "child of msqrt");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mroot-001", true);
+      }, "child of parent");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mfrac-001", false, "numerator");
+          assert_cramped("mfrac-002", true, "denominator");
+      }, "child of mfrac");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msub-001", false, "base");
+          assert_cramped("msub-002", true, "subscript");
+      }, "child of msub");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msup-001", false, "base");
+          assert_cramped("msup-002", false, "superscript");
+      }, "child of msup");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msubsup-001", false, "base");
+          assert_cramped("msubsup-002", true, "subscript");
+          assert_cramped("msubsup-003", false, "superscript");
+      }, "child of msubsup");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("munder-001", false, "base");
+          assert_cramped("munder-002", true, "underscript");
+      }, "child of munder");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mover-001", false, "base");
+          assert_cramped("mover-002", false, "non-accent overscript");
+      }, "child of mover");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("munderover-001", false, "base");
+          assert_cramped("munderover-002", false, "underscript");
+          assert_cramped("munderover-003", false, "non-accent overscript");
+      }, "child of munderover");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mover-003", true, "accent overscript");
+          assert_cramped("mover-004", false, "accent superscript");
+      }, "accent child of mover");
+
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("munderover-004", true, "accent overscript");
+          assert_cramped("munderover-005", false, "accent superscript");
+      }, "accent child of munderover");
+
+      done();
+  }
+</script>
+</head>
+<body>
+  <div id="log"></div>
+  <p>
+    <math id="math-001">
+      <msup class="testedElement">
+        <mspace height="2em" width="2em"/>
+        <mspace height="1em" width="1em"/>
+      </msup>
+    </math>
+    <math>
+      <mrow id="mrow-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mrow>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msqrt>
+        <!-- This is a child of a msqrt so it is cramped. As a consequence,
+             all its descendants are cramped too. -->
+        <munderover>
+          <mover>
+            <munder>
+              <msubsup>
+                <msup>
+                  <msub>
+                    <mfrac>
+                      <mrow id="mrow-002">
+                        <msup class="testedElement">
+                          <mspace height="2em" width="2em"/>
+                          <mspace height="1em" width="1em"/>
+                        </msup>
+                      </mrow>
+                      <mspace/>
+                    </mfrac>
+                    <mspace/>
+                  </msub>
+                  <mspace/>
+                </msup>
+                <mspace/>
+                <mspace/>
+              </msubsup>
+              <mspace/>
+            </munder>
+            <mspace/>
+          </mover>
+          <mspace/>
+          <mspace/>
+        </munderover>
+      </msqrt>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msqrt id="msqrt-001">
+        <mn>0</mn>
+        <mn>1</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>3</mn>
+        <mn>4</mn>
+      </msqrt>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mroot id="mroot-001">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mroot>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mroot id="mroot-002">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </mroot>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mfrac id="mfrac-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </mroot>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mfrac id="mfrac-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mroot>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msub id="msub-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </msub>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msub id="msub-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </msub>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msup id="msup-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </msup>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msup id="msup-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </msup>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msubsup id="msubsup-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+        <mn>2</mn>
+      </msubsup>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msubsup id="msubsup-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>2</mn>
+      </msubsup>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msubsup id="msubsup-003">
+        <mn>0</mn>
+        <mn>1</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </msubsup>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munder id="munder-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </munder>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munder id="munder-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </munder>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mover id="mover-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </mover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mover id="mover-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mover accent="true" id="mover-003">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mover accent="true" id="mover-004">
+        <mo movablelimits="true">0</mo>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover id="munderover-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+        <mn>2</mn>
+      </munderover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover id="munderover-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>2</mn>
+      </munderover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover id="munderover-003">
+        <mn>0</mn>
+        <mn>1</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </munderover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover accent="true" id="munderover-004">
+        <mn>0</mn>
+        <mn>1</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </munderover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover accent="true" id="munderover-005">
+        <mo movablelimits="true">0</mo>
+        <mn>1</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </munderover>
+    </math>
+  </p>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-1.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-1.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-1.html	2019-09-15 11:33:27.000000000 +0000
@@ -62,10 +62,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-2.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-2.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-2.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/subsup-parameters-2.html	2019-09-15 11:33:28.000000000 +0000
@@ -27,10 +27,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   /*
     These two tests verify that:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-1.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-1.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-1.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-1.html	2019-09-15 11:33:27.000000000 +0000
@@ -38,10 +38,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-2.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-2.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-2.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-2.html	2019-09-15 11:33:26.000000000 +0000
@@ -38,10 +38,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-3.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-3.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-3.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-3.html	2019-09-15 11:33:27.000000000 +0000
@@ -41,10 +41,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => {   document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-4.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-4.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-4.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/scripts/underover-parameters-4.html	2019-09-15 11:33:28.000000000 +0000
@@ -41,10 +41,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => {   document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/spaces/space-like-004.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/spaces/space-like-004.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/spaces/space-like-004.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/spaces/space-like-004.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,6 +11,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
+<script src="/mathml/support/box-navigation.js"></script>
 <style>
   /* Default spacing of operator 'X' is 0.2777777777777778em so quite different
      from the measured/specified 0em and 1em. */
@@ -27,17 +28,26 @@
       color: blue !important;
       background: blue !important;
   }
+  .oof1 {
+      position: absolute;
+  }
+  .oof2 {
+      position: fixed;
+  }
+  .nobox {
+      display: none;
+  }
 </style>
 <script>
   function spaceBefore(id) {
       var element = document.getElementById(id);
-      var mnBeforeParent = element.parentNode.previousElementSibling;
+      var mnBeforeParent = previousInFlowSibling(element.parentNode);
       return element.getBoundingClientRect().left - mnBeforeParent.getBoundingClientRect().right;
   }
 
   function spaceAfter(id) {
       var element = document.getElementById(id);
-      var mnAfterParent = element.parentNode.nextElementSibling;
+      var mnAfterParent = nextInFlowSibling(element.parentNode);
       return mnAfterParent.getBoundingClientRect().left - element.getBoundingClientRect().right;
   }
 
@@ -56,10 +66,22 @@
 
       test(function() {
           assert_true(MathMLFeatureDetection.has_operator_spacing());
+          assert_approx_equals(spaceBefore("complex1-bis"), emToPx, epsilon);
+          assert_approx_equals(spaceAfter("complex1-bis"), emToPx, epsilon);
+      }, "complex space-like subtree, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_operator_spacing());
           assert_approx_equals(spaceBefore("complex2"), 0, epsilon);
           assert_approx_equals(spaceAfter("complex2"), 2 * emToPx, epsilon);
       }, "complex non-space-like subtree");
 
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_operator_spacing());
+          assert_approx_equals(spaceBefore("complex2-bis"), 0, epsilon);
+          assert_approx_equals(spaceAfter("complex2-bis"), 2 * emToPx, epsilon);
+      }, "complex non-space-like subtree, from in-flow children");
+
       done();
   }
 </script>
@@ -129,6 +151,121 @@
   </p>
   <p>
     <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mrow>
+        <!-- This element is space-like because it is made of nested
+             mrow, mstyle, mpadded, mphantom, mtext, mspace
+          -->
+        <mrow class="testedElement" id="complex1-bis">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mtext>X</mtext>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mstyle>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mstyle>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mstyle>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mtext>X</mtext>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mpadded>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mrow></mrow>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mrow>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mrow>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mpadded>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mtext>X</mtext>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mpadded>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mpadded>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          </mstyle>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace width="25px"></mspace>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </mrow>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="1em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mrow>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
       <mn>X</mn>
       <mrow>
         <!-- This element is not space-like. It is made of nested
@@ -189,5 +326,121 @@
       <mn>X</mn>
     </math>
   </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mrow>
+        <!-- This element is not space-like. It is made of nested
+             mrow, mstyle, mpadded, mphantom, mtext, mspace but contains
+             one non-space like descendant (an mn element).
+          -->
+        <mrow class="testedElement" id="complex2-bis">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mtext>X</mtext>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mstyle>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mstyle>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mstyle>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mtext>X</mtext>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mpadded>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mrow></mrow>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mrow>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mrow>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mpadded>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mtext>X</mtext>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mpadded>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mn>X</mn> <!-- mn is not space-like -->
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mpadded>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          </mstyle>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace width="25px"></mspace>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </mrow>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="1em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mrow>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
 </body>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/tables/table-axis-height.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/tables/table-axis-height.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/presentation-markup/tables/table-axis-height.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/presentation-markup/tables/table-axis-height.html	2019-09-15 11:33:27.000000000 +0000
@@ -26,10 +26,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-013.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-013.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-013.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-013.html	2019-09-15 11:33:27.000000000 +0000
@@ -21,10 +21,7 @@
         document.getElementById("m6").removeAttribute("displaystyle");
         document.documentElement.removeAttribute("class");
       }
-      window.addEventListener("load", function() {
-        // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-        requestAnimationFrame(() => { document.fonts.ready.then(doTest); });
-      });
+      window.addEventListener("load", () => { document.fonts.ready.then(doTest); });
     </script>
     <link rel="stylesheet" href="/fonts/ahem.css">
     <style>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-014.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-014.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-014.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-014.html	2019-09-15 11:33:27.000000000 +0000
@@ -18,10 +18,7 @@
                  setAttribute('mathbackground', 'red');
         document.documentElement.removeAttribute("class");
       }
-      window.addEventListener("load", function() {
-        // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-        requestAnimationFrame(() => { document.fonts.ready.then(doTest); });
-      });
+      window.addEventListener("load", () => { document.fonts.ready.then(doTest); });
     </script>
     <link rel="stylesheet" href="/fonts/ahem.css">
     <style>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-1.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-1.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-1.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-1.html	2019-09-15 11:33:27.000000000 +0000
@@ -31,10 +31,7 @@
       assert_approx_equals(elementSize, expectedSize, epsilon, description);
   }
 
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
       for (transform in AttributeValueTransforms) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-2.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-2.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-2.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/css-styling/displaystyle-2.html	2019-09-15 11:33:28.000000000 +0000
@@ -31,10 +31,7 @@
       assert_approx_equals(elementSize, expectedSize, epsilon, description);
   }
 
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
       for (transform in AttributeValueTransforms) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/css-styling/lengths-2.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/css-styling/lengths-2.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/css-styling/lengths-2.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/css-styling/lengths-2.html	2019-09-15 11:33:28.000000000 +0000
@@ -29,10 +29,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html	2019-09-15 11:33:27.000000000 +0000
@@ -14,9 +14,9 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <math
-  oncopy="document.copyHappened = true"
-  oncut="document.cutHappened = true"
-  onpaste="document.pasteHappened = true"
+  oncopy="window.copyHappened1 = true"
+  oncut="window.cutHappened1 = true"
+  onpaste="window.pasteHappened1 = true"
 >
   <mi>E</mi>
 </math>
@@ -56,10 +56,62 @@
       );
       compiledHandler();
       assert_true(
-        window[name + "Happened"],
+        window[`${name}Happened1`],
         "Calling the handler must run the code"
       );
     }, `${handlerName}: the content attribute must be compiled into a function as the corresponding property`);
+
+    test(() => {
+        const mathEl = document.createElementNS(
+            "http://www.w3.org/1998/Math/MathML",
+            "math"
+        );
+        assert_equals(mathEl[handlerName], null, `The ${handlerName} property must be null (no attribute)`);
+
+        mathEl.setAttribute(handlerName, `window.${handlerName}Happened2 = true;`);
+        const compiledHandler = mathEl[handlerName];
+        assert_equals(
+            typeof compiledHandler,
+            "function",
+            `The ${handlerName} property must be a function (set attribute)`
+        );
+        compiledHandler();
+        assert_true(
+            window[`${handlerName}Happened2`],
+            "Calling the handler must run the code (set attribute)"
+        );
+
+        window[`${handlerName}Happened2`] = false;
+        const clonedMathEl = mathEl.cloneNode(true);
+        const clonedCompiledHandler = clonedMathEl[handlerName];
+        assert_equals(
+            typeof clonedCompiledHandler,
+            "function",
+            `The ${handlerName} property must be a function (clone node)`
+        );
+        clonedCompiledHandler();
+        assert_true(
+            window[`${handlerName}Happened2`],
+            "Calling the handler must run the code (clone node)"
+        );
+
+        mathEl.setAttribute(handlerName, `window.${handlerName}Happened3 = true;`);
+        const newCompiledHandler = mathEl[handlerName];
+        assert_equals(
+            typeof newCompiledHandler,
+            "function",
+            `The ${handlerName} property must be a function (modify attribute)`
+        );
+        newCompiledHandler();
+        assert_true(
+            window[`${handlerName}Happened3`],
+            "Calling the handler must run the code (modify attribute)"
+        );
+
+        mathEl.removeAttribute(handlerName);
+        assert_equals(mathEl[handlerName], null, `The ${handlerName} property must be null (remove attribute)`);
+    }, `${handlerName}: dynamic changes on the attribute`);
+
   }
 
   EVENTS.forEach(name => {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -3,11 +3,16 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML 'ElementCSSInlineStyle` Dynamic Tests</title>
+<style>
+mspace {
+  background-color: green;
+}
+</style>
 </head>
 <body>
   <span>This tests that `ElementCSSInlineStyle` interface changes update rendering.</span>
   <div>
-    <math style="background-color: green"><mspace width="50px" height="100px"/><mspace width="50px" height="100px"/></math>
+    <math><mspace width="50px" height="100px"/><mspace width="50px" height="100px"/></math>
   </div>
 </body>
 </html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html	2019-09-15 11:33:27.000000000 +0000
@@ -58,24 +58,71 @@
         }, `${name}: the default value must be null`);
 
         test(() => {
+          const div = document.getElementById("container");
+          div.innerHTML = `<math ${name}="window.${name}Happened1 = true;"></math>`;
+          const compiledHandler = div.firstElementChild[name];
+          assert_equals(
+            typeof compiledHandler,
+            "function",
+            `The ${name} property must be a function`
+          );
+          compiledHandler();
+          assert_true(
+            window[`${name}Happened1`],
+            "Calling the handler must run the code"
+          );
+        }, `${name}: the content attribute must be compiled into a function as the corresponding property`);
+
+        test(() => {
           const el = document.createElementNS(
             "http://www.w3.org/1998/Math/MathML",
             "math"
           );
-          el.setAttribute(name, `window.${name}Happened = true;`);
-          const compiledHandler = el[name];
+          assert_equals(el[name], null, `The ${name} property must be null (no attribute)`);
 
+          el.setAttribute(name, `window.${name}Happened2 = true;`);
+          const compiledHandler = el[name];
           assert_equals(
             typeof compiledHandler,
             "function",
-            `The ${name} property must be a function`
+            `The ${name} property must be a function (set attribute)`
           );
           compiledHandler();
           assert_true(
-            window[name + "Happened"],
-            "Calling the handler must run the code"
+            window[`${name}Happened2`],
+            "Calling the handler must run the code (set attribute)"
+          );
+
+          window[`${name}Happened2`] = false;
+          const clonedEl = el.cloneNode(true);
+          const clonedCompiledHandler = clonedEl[name];
+          assert_equals(
+            typeof clonedCompiledHandler,
+            "function",
+            `The ${name} property must be a function (clone node)`
+          );
+          clonedCompiledHandler();
+          assert_true(
+            window[`${name}Happened2`],
+            "Calling the handler must run the code (clone node)"
           );
-        }, `${name}: the content attribute must be compiled into a function as the corresponding property`);
+
+          el.setAttribute(name, `window.${name}Happened3 = true;`);
+          const newCompiledHandler = el[name];
+          assert_equals(
+            typeof newCompiledHandler,
+            "function",
+            `The ${name} property must be a function (modify attribute)`
+          );
+          newCompiledHandler();
+          assert_true(
+            window[`${name}Happened3`],
+            "Calling the handler must run the code (modify attribute)"
+          );
+
+          el.removeAttribute(name);
+          assert_equals(el[name], null, `The ${name} property must be null (remove attribute)`);
+        }, `${name}: dynamic changes on the attribute`);
 
         test(() => {
           const element = document.createElementNS(
@@ -97,3 +144,5 @@
       done();
     });
 </script>
+
+<div style="display: none" id="container"></div>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/support/box-navigation.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/support/box-navigation.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mathml/support/box-navigation.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mathml/support/box-navigation.js	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,29 @@
+function IsInFlow(element) {
+    var style = window.getComputedStyle(element);
+    return style.getPropertyValue("display") !== "none" &&
+        style.getPropertyValue("position") !== "absolute" &&
+        style.getPropertyValue("position") !== "fixed";
+}
+
+function firstInFlowChild(element) {
+    var child = element.firstElementChild;
+    if (!child || IsInFlow(child))
+        return child;
+    return nextInFlowSibling(child);
+}
+
+function nextInFlowSibling(element) {
+    var child = element;
+    do {
+        child = child.nextElementSibling;
+    } while (child && !IsInFlow(child));
+    return child;
+}
+
+function previousInFlowSibling(element) {
+    var child = element;
+    do {
+        child = child.previousElementSibling;
+    } while (child && !IsInFlow(child));
+    return child;
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "audio-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "audio-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "audio-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "audio-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "audio-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "audio-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "audio-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "audio-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/audio-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: audio-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "audio-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: beacon-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "beacon-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: beacon-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "beacon-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: beacon-request
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "beacon-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: beacon-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "beacon-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: beacon-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "beacon-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/beacon-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: beacon-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "beacon-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/classic-data-worker-fetch/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: classic-data-worker-fetch
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "classic-data-worker-fetch",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "fetch-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "fetch-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "fetch-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "fetch-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: fetch-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "fetch-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/fetch-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: fetch-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "fetch-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for audio-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for audio-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for audio-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for audio-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for audio-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for audio-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/audio-tag/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for beacon to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for beacon to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/beacon/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for img-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for img-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for img-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for img-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for img-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for img-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/img-tag/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for link-css-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for link-css-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-css-tag/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/link-prefetch-tag/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for object-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for object-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/object-tag/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for picture-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for picture-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/picture-tag/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for script-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/script-tag/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for video-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for video-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for video-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for video-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for video-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for video-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/video-tag/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-ws",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-ws",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-ws",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/cross-ws.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-ws",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-ws",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-wss",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-wss",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-wss.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-ws",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/websocket/same-ws.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-classic/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-import-data to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-import-data/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worker-module/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-animation to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-animation-import-data/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-audio to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-audio-import-data/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-layout to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-layout-import-data/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-paint to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/worklet-paint-import-data/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.http-rp/opt-in/xhr/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for audio-tag to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for audio-tag to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/audio-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/cross-http.no-redirect.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/beacon/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for beacon to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/fetch/same-https.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for img-tag to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for img-tag to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/img-tag/same-https.no-redirect.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-css-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for link-css-tag to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/link-prefetch-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/same-http.no-redirect.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/object-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for object-tag to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/picture-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for picture-tag to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/script-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for video-tag to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for video-tag to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/video-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/cross-ws.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/cross-ws.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/cross-ws.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/cross-ws.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-ws",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/same-ws.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/same-ws.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/same-ws.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/same-ws.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-ws",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/same-wss.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/same-wss.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/same-wss.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/websocket/same-wss.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-wss",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-classic/same-https.no-redirect.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worker-module/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-animation-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/cross-http.no-redirect.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-audio-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout/same-https.no-redirect.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-layout-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-http.no-redirect.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/worklet-paint-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/same-http.no-redirect.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/opt-in/xhr/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/audio-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for audio-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "audio-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for beacon to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for beacon to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/beacon/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for beacon to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "beacon",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/fetch/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/img-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for img-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "img-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for link-css-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for link-css-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-css-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-css-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-css-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for link-prefetch-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/link-prefetch-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for link-prefetch-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "link-prefetch-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for object-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for object-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/object-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for object-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "object-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for picture-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for picture-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/picture-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for picture-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "picture-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for script-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for script-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/script-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for script-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "script-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/video-tag/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Optionally-blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of optionally-blockable content">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
+    <meta name="assert" content="Mixed-Content: Expects allowed for video-tag to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "video-tag",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-ws",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-ws",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/cross-ws.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to cross-ws origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-ws",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-ws",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-ws",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-wss.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-wss.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-wss.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-wss.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-wss",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-wss.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-wss.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-wss.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-wss.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for websocket to same-wss origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-wss",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/websocket/same-ws.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for websocket to same-ws origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-ws",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "websocket",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-classic to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-classic/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-classic to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-classic",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-import-data to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-import-data to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-import-data/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-import-data to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worker-module to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worker-module/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worker-module to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worker-module",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-animation to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-animation to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-animation-import-data to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-animation-import-data/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-animation-import-data to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-animation-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-audio to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-audio to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-audio-import-data to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-audio-import-data/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-audio-import-data to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-audio-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-layout to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-layout to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-layout-import-data to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-layout-import-data/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-layout-import-data to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-layout-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-paint to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-paint to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for worklet-paint-import-data to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/worklet-paint-import-data/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for worklet-paint-import-data to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "worklet-paint-import-data",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-https.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for xhr to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/top.meta/unset/xhr/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for xhr to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [],
+          "source_scheme": "https",
+          "subresource": "xhr",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.no-redirect.https.html.headers	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/cross-http.swap-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.keep-scheme.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-http.swap-scheme.https.html.headers	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1 @@
+Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/opt-in/fetch/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context.">
+    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.keep-scheme.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/cross-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to cross-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "cross-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.keep-scheme.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "keep-scheme",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.keep-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.keep-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.keep-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.keep-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and keep-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "keep-scheme",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.no-redirect.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.no-redirect.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.no-redirect.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-https.no-redirect.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Allowed content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of allowed content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
+    <meta name="assert" content="Mixed-Content: Expects allowed for fetch to same-https origin and no-redirect redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "allowed",
+          "origin": "same-https",
+          "redirection": "no-redirect",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/gen/worker-classic-data.meta/unset/fetch/same-http.swap-scheme.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using common/security-features/tools/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Mixed-Content: Blockable content</title>
+    <meta charset='utf-8'>
+    <meta name="description" content="Test behavior of blockable content.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
+    <meta name="assert" content="Mixed-Content: Expects blocked for fetch to same-http origin and swap-scheme redirection from https context.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
+    <script src="/mixed-content/generic/test-case.sub.js"></script>
+  </head>
+  <body>
+    <script>
+      TestCase(
+        {
+          "expectation": "blocked",
+          "origin": "same-http",
+          "redirection": "swap-scheme",
+          "source_context_list": [
+            {
+              "policyDeliveries": [],
+              "sourceContextType": "worker-classic-data"
+            }
+          ],
+          "source_scheme": "https",
+          "subresource": "fetch",
+          "subresource_policy_deliveries": []
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/generic/mixed-content-test-case.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/generic/mixed-content-test-case.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/generic/mixed-content-test-case.js	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/generic/mixed-content-test-case.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-/**
- * @fileoverview Test case for mixed-content in Web Platform Tests.
- * @author burnik@google.com (Kristijan Burnik)
- */
-
-// TODO: This function is currently placed and duplicated at:
-// - mixed-content/generic/mixed-content-test-case.js
-// - referrer-policy/generic/referrer-policy-test-case.js
-// but should be moved to /common/security-features/resources/common.js.
-function getSubresourceOrigin(originType) {
-  const httpProtocol = "http";
-  const httpsProtocol = "https";
-  const wsProtocol = "ws";
-  const wssProtocol = "wss";
-
-  const sameOriginHost = "{{host}}";
-  const crossOriginHost = "{{domains[www1]}}";
-
-  // These values can evaluate to either empty strings or a ":port" string.
-  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
-  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
-  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
-  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
-
-  /**
-    @typedef OriginType
-    @type {string}
-
-    Represents the origin of the subresource request URL.
-    The keys of `originMap` below are the valid values.
-
-    Note that there can be redirects from the specified origin
-    (see RedirectionType), and thus the origin of the subresource
-    response URL might be different from what is specified by OriginType.
-  */
-  const originMap = {
-    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
-    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
-    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
-    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
-    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
-    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
-    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
-    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
-  };
-
-  return originMap[originType];
-}
-
-/**
- * MixedContentTestCase exercises all the tests for checking browser behavior
- * when resources regarded as mixed-content are requested. A single run covers
- * only a single scenario.
- * @param {object} scenario A JSON describing the test arrangement and
- *     expectation(s). Refer to /mixed-content/spec.src.json for details.
- * @param {string} description The test scenario verbose description.
- * @param {SanityChecker} sanityChecker Instance of an object used to check the
- *     running scenario. Useful in debug mode. See ./sanity-checker.js.
- *     Run {@code ./tools/generate.py -h} for info on test generating modes.
- * @return {object} Object wrapping the start method used to run the test.
- */
-function MixedContentTestCase(scenario, description, sanityChecker) {
-  sanityChecker.checkScenario(scenario, subresourceMap);
-
-  let sourceContextList = [];
-  let subresourceType = scenario.subresource;
-  if (subresourceType === 'classic-data-worker-fetch') {
-    // Currently 'classic-data-worker-fetch' (fetch API from inside classic
-    // data: worker) is handled as a kind of subresource request
-    // on the genarator side, but should be processed using the combination of
-    // SourceContext list (classic data: worker) + Subresource (fetch API)
-    // on the JavaScript side.
-    // We bridge this inconsistency here, and will later pass these information
-    // directly from the generated tests and remove this conversion here.
-    subresourceType = 'fetch-request';
-    sourceContextList = [{sourceContextType: 'worker-classic-data'}];
-  }
-
-  const originTypeConversion = {
-    "same-host-https": "same-https",
-    "same-host-http": "same-http",
-    "cross-origin-https": "cross-https",
-    "cross-origin-http": "cross-http",
-    "same-host-wss": "same-wss",
-    "same-host-ws": "same-ws",
-    "cross-origin-wss": "cross-wss",
-    "cross-origin-ws": "cross-ws",
-  };
-
-  const urls = getRequestURLs(subresourceType,
-                              originTypeConversion[scenario.origin],
-                              scenario.redirection);
-  const checkResult = _ => {
-    // Send request to check if the key has been torn down.
-    return xhrRequest(urls.assertUrl)
-      .then(assertResult => {
-          // Now check if the value has been torn down. If it's still there,
-          // we have blocked the request to mixed-content.
-          assert_equals(assertResult.status, scenario.expectation,
-            "The resource request should be '" + scenario.expectation + "'.");
-        });
-  };
-
-  function runTest() {
-    /** @type {Subresource} */
-    const subresource = {
-      subresourceType: subresourceType,
-      url: urls.testUrl,
-      policyDeliveries: []
-    };
-
-    promise_test(() => {
-      return xhrRequest(urls.announceUrl)
-        // Send out the real resource request.
-        // This should tear down the key if it's not blocked.
-        .then(_ => invokeRequest(subresource, sourceContextList))
-        // We check the key state, regardless of whether the main request
-        // succeeded or failed.
-        .then(checkResult, checkResult);
-      }, description);
-  }  // runTest
-
-  return {start: runTest};
-}  // MixedContentTestCase
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/generic/test-case.sub.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/generic/test-case.sub.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/generic/test-case.sub.js	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/generic/test-case.sub.js	2019-09-15 11:33:27.000000000 +0000
@@ -3,50 +3,6 @@
  * @author burnik@google.com (Kristijan Burnik)
  */
 
-// TODO: This function is currently placed and duplicated at:
-// - mixed-content/generic/mixed-content-test-case.js
-// - referrer-policy/generic/referrer-policy-test-case.js
-// but should be moved to /common/security-features/resources/common.js.
-function getSubresourceOrigin(originType) {
-  const httpProtocol = "http";
-  const httpsProtocol = "https";
-  const wsProtocol = "ws";
-  const wssProtocol = "wss";
-
-  const sameOriginHost = "{{host}}";
-  const crossOriginHost = "{{domains[www1]}}";
-
-  // These values can evaluate to either empty strings or a ":port" string.
-  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
-  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
-  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
-  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
-
-  /**
-    @typedef OriginType
-    @type {string}
-
-    Represents the origin of the subresource request URL.
-    The keys of `originMap` below are the valid values.
-
-    Note that there can be redirects from the specified origin
-    (see RedirectionType), and thus the origin of the subresource
-    response URL might be different from what is specified by OriginType.
-  */
-  const originMap = {
-    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
-    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
-    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
-    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
-    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
-    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
-    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
-    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
-  };
-
-  return originMap[originType];
-}
-
 /**
  * MixedContentTestCase exercises all the tests for checking browser behavior
  * when resources regarded as mixed-content are requested. A single run covers
@@ -62,37 +18,9 @@
 function TestCase(scenario, description, sanityChecker) {
   sanityChecker.checkScenario(scenario, subresourceMap);
 
-  const redirectionTypeConversion = {
-    "no-redirect": "no-redirect",
-    "keep-scheme": "keep-scheme-redirect",
-    "swap-scheme": "swap-scheme-redirect",
-    "keep-origin": "keep-origin-redirect",
-    "swap-origin": "swap-origin-redirect"
-  };
-  const subresourceTypeConversion = {
-    "beacon": "beacon-request",
-    "fetch": "fetch-request",
-    "xhr": "xhr-request",
-    "websocket": "websocket-request",
-    "worker-classic": "worker-request",
-    "worker-module": "module-worker",
-    "worker-import-data": "module-data-worker-import",
-    "sharedworker-classic": "shared-worker",
-    "worklet-animation": "worklet-animation-top-level",
-    "worklet-audio": "worklet-audio-top-level",
-    "worklet-layout": "worklet-layout-top-level",
-    "worklet-paint": "worklet-paint-top-level",
-    "worklet-animation-import-data": "worklet-animation-data-import",
-    "worklet-audio-import-data": "worklet-audio-data-import",
-    "worklet-layout-import-data": "worklet-layout-data-import",
-    "worklet-paint-import-data": "worklet-paint-data-import"
-  };
-  const subresourceType =
-      subresourceTypeConversion[scenario.subresource] || scenario.subresource;
-
-  const urls = getRequestURLs(subresourceType,
+  const urls = getRequestURLs(scenario.subresource,
                               scenario.origin,
-                              redirectionTypeConversion[scenario.redirection]);
+                              scenario.redirection);
   const checkResult = _ => {
     // Send request to check if the key has been torn down.
     return xhrRequest(urls.assertUrl)
@@ -107,7 +35,7 @@
   function runTest() {
     /** @type {Subresource} */
     const subresource = {
-      subresourceType: subresourceType,
+      subresourceType: scenario.subresource,
       url: urls.testUrl,
       policyDeliveries: scenario.subresource_policy_deliveries,
     };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "img-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "img-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "img-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "img-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "img-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "img-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "img-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "img-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/img-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: img-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "img-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-css-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-css-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-css-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-css-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/link-prefetch-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: link-prefetch-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "link-prefetch-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-data-worker-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-data-worker-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-data-worker-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/module-worker-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: module-worker-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "module-worker-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "object-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "object-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "object-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "object-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: object-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "object-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/object-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: object-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "object-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "picture-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "picture-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "picture-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "picture-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: picture-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "picture-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/picture-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: picture-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "picture-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "script-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "script-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "script-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "script-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: script-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "script-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/script-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: script-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "script-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "video-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "video-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "video-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "video-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "video-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "video-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/meta-csp/cross-origin-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "video-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-http/top-level/no-redirect/optionally-blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "video-tag",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/keep-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/no-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-http/top-level/swap-scheme-redirect/optionally-blockable/no-opt-in-allows.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Optionally-blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of optionally-blockable content">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-optionally-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/video-tag/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: video-tag
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "video-tag",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-wss
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: websocket-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-wss",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "websocket-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-wss
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: websocket-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-wss",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "websocket-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/http-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/meta-csp/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-wss
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: websocket-request
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-wss",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "websocket-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/cross-origin-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/keep-scheme-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/no-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-ws/top-level/swap-scheme-redirect/blockable/ws-downgrade-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-ws
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: websocket-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-ws",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "websocket-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/keep-scheme-redirect/allowed/websocket-allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-wss
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: websocket-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-wss",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "websocket-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/websocket-request/no-opt-in/same-host-wss/top-level/no-redirect/allowed/websocket-allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-wss
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: websocket-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-wss",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "websocket-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worker-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worker-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worker-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worker-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worker-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worker-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worker-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worker-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worker-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-animation-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-animation-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-animation-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-audio-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-audio-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-audio-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-layout-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-layout-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-layout-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-data-import/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-data-import
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-data-import",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/worklet-paint-top-level/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: worklet-paint-top-level
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "worklet-paint-top-level",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/cross-origin-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/keep-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-http/top-level/swap-scheme-redirect/blockable/opt-in-blocks.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "xhr-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: http-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "http-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "xhr-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/http-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html.headers	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-Content-Security-Policy: block-all-mixed-content
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/cross-origin-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-http/top-level/no-redirect/blockable/opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/meta-csp/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: meta-csp
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: allowed">
-    <meta http-equiv="Content-Security-Policy" content="block-all-mixed-content">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "meta-csp",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "xhr-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/cross-origin-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: cross-origin-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "cross-origin-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/keep-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/no-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-http/top-level/swap-scheme-redirect/blockable/no-opt-in-blocks.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Blockable content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of blockable content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/#category-blockable">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-http
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: swap-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: blocked">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-http",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "swap-scheme-redirect",
-          "subresource": "xhr-request",
-          "expectation": "blocked"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/keep-scheme-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: keep-scheme-redirect
-                                 subresource: xhr-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "keep-scheme-redirect",
-          "subresource": "xhr-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/mixed-content/xhr-request/no-opt-in/same-host-https/top-level/no-redirect/allowed/allowed.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<!-- DO NOT EDIT! Generated by mixed-content/generic/tools/generate.py using mixed-content/generic/template/test.release.html.template. -->
-<html>
-  <head>
-    <title>Mixed-Content: Allowed content</title>
-    <meta charset='utf-8'>
-    <meta name="description" content="Test behavior of allowed content.">
-    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
-    <link rel="help" href="http://www.w3.org/TR/mixed-content/">
-    <meta name="assert" content="opt_in_method: no-opt-in
-                                 origin: same-host-https
-                                 source_scheme: https
-                                 context_nesting: top-level
-                                 redirection: no-redirect
-                                 subresource: xhr-request
-                                 expectation: allowed">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/mixed-content/generic/mixed-content-test-case.js?pipe=sub"></script>
-  </head>
-  <body>
-    <script>
-      MixedContentTestCase(
-        {
-          "opt_in_method": "no-opt-in",
-          "origin": "same-host-https",
-          "source_scheme": "https",
-          "context_nesting": "top-level",
-          "redirection": "no-redirect",
-          "subresource": "xhr-request",
-          "expectation": "allowed"
-        },
-        document.querySelector("meta[name=assert]").content,
-        new SanityChecker()
-      ).start();
-      </script>
-    <div id="log"></div>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/orientation-event/META.yml firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/orientation-event/META.yml
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/orientation-event/META.yml	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/orientation-event/META.yml	2019-09-15 11:33:29.000000000 +0000
@@ -1,4 +1,4 @@
-spec: https://w3c.github.io/deviceorientation/spec-source-orientation.html
+spec: https://w3c.github.io/deviceorientation/
 suggested_reviewers:
   - reillyeon
   - timvolodine
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/preload/single-download-preload.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/preload/single-download-preload.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/preload/single-download-preload.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/preload/single-download-preload.html	2019-09-15 11:33:28.000000000 +0000
@@ -23,10 +23,10 @@
         background-image: url(resources/square.png?backgroundi&single-download-preload);
     }
     @font-face {
-      font-family:ahem;
+      font-family:myFont;
       src: url(/fonts/CanvasTest.ttf?single-download-preload);
     }
-    span { font-family: ahem, Arial; }
+    span { font-family: myFont, Arial; }
 </style>
 <link rel="stylesheet" href="resources/dummy.css?single-download-preload">
 <script src="resources/dummy.js?single-download-preload"></script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/quirks/reference/table-cell-width-calculation-abspos-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/quirks/reference/table-cell-width-calculation-abspos-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/quirks/reference/table-cell-width-calculation-abspos-ref.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/quirks/reference/table-cell-width-calculation-abspos-ref.html	2019-09-15 11:33:27.000000000 +0000
@@ -1,3 +1,4 @@
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 table {
   font-size: 10px;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/quirks/table-cell-width-calculation-abspos.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/quirks/table-cell-width-calculation-abspos.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/quirks/table-cell-width-calculation-abspos.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/quirks/table-cell-width-calculation-abspos.html	2019-09-15 11:33:28.000000000 +0000
@@ -1,6 +1,7 @@
 <title>An out-of-flow imagef in the table cell width calculation quirk</title>
 <link rel="match" href="reference/table-cell-width-calculation-abspos-ref.html">
 <link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 table {
   font-size: 10px;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/README.md firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/README.md
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/README.md	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/README.md	2019-09-15 11:33:23.000000000 +0000
@@ -1,4 +1,4 @@
-The web-platform-tests Project [![IRC chat](https://goo.gl/6nCIks)](http://irc.w3.org/?channels=testing)
+The web-platform-tests Project
 ==============================
 
 The web-platform-tests Project is a W3C-coordinated attempt to build a
@@ -12,6 +12,30 @@
 layers of abstraction to paper over the gaps left by specification
 editors and implementors.
 
+The most important sources of information and activity are:
+
+- [github.com/web-platform-tests/wpt](https://github.com/web-platform-tests/wpt):
+  the canonical location of the project's source code revision history and the
+  discussion forum for changes to the code
+- [web-platform-tests.org](https://web-platform-tests.org): the documentation
+  website; details how to set up the project, how to write tests, how to give
+  and receive peer review, how to serve as an administrator, and more
+- [web-platform-tests.live](http://web-platform-tests.live): a public
+  deployment of the test suite, allowing anyone to run the tests by visiting
+  from an Internet-enabled browser of their choice
+- [wpt.fyi](https://wpt.fyi): an archive of test results collected from an
+  array of web browsers on a regular basis
+- [Real-time chat room](http://irc.w3.org/?channels=testing): the
+  [IRC](http://www.irchelp.org/) chat room named `#testing` on
+  [irc.w3.org](https://www.w3.org/wiki/IRC); includes participants located
+  around the world, but busiest during the European working day; [all
+  discussion is archived here](https://w3.logbot.info/testing)
+- [Mailing list](https://lists.w3.org/Archives/Public/public-test-infra/): a
+  public and low-traffic discussion list
+
+**If you'd like clarification about anything**, don't hesitate to ask in the
+chat room or on the mailing list.
+
 Setting Up the Repo
 ===================
 
@@ -251,25 +275,3 @@
 For more details, see the [lint-tool documentation][lint-tool].
 
 [lint-tool]: https://web-platform-tests.org/writing-tests/lint-tool.html
-
-Getting Involved
-================
-
-If you wish to contribute actively, you're very welcome to join the
-public-test-infra@w3.org mailing list (low traffic) by
-[signing up to our mailing list](mailto:public-test-infra-request@w3.org?subject=subscribe).
-The mailing list is [archived][mailarchive].
-
-Join us on irc #testing ([irc.w3.org][ircw3org], port 6665). The channel
-is [archived][ircarchive].
-
-[contributing]: https://github.com/web-platform-tests/wpt/blob/master/CONTRIBUTING.md
-[ircw3org]: https://www.w3.org/wiki/IRC
-[ircarchive]: https://w3.logbot.info/testing
-[mailarchive]: https://lists.w3.org/Archives/Public/public-test-infra/
-
-Documentation
-=============
-
-* [How to write and review tests](https://web-platform-tests.org/)
-* [Documentation for the wptserve server](http://wptserve.readthedocs.org/en/latest/)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/child-css/processing-instruction.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/child-css/processing-instruction.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/child-css/processing-instruction.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/child-css/processing-instruction.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/font-face/external-stylesheet.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html	2019-09-15 11:33:29.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/font-face/internal-stylesheet.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/font-face/processing-instruction.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/font-face/processing-instruction.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/font-face/processing-instruction.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/font-face/processing-instruction.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/external-import-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/external-import-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/external-import-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/external-import-stylesheet.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/external-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/external-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/external-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/external-stylesheet.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/inline-style.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/inline-style.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/inline-style.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/inline-style.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/internal-import-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/internal-import-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/internal-import-stylesheet.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/internal-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/internal-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/internal-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/internal-stylesheet.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/presentation-attribute.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/presentation-attribute.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/presentation-attribute.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/presentation-attribute.html	2019-09-15 11:33:29.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/processing-instruction.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/processing-instruction.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/image/processing-instruction.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/image/processing-instruction.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/svg/external-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/svg/external-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/svg/external-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/svg/external-stylesheet.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="never">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/svg/inline-style.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/svg/inline-style.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/svg/inline-style.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/svg/inline-style.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/svg/internal-stylesheet.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/svg/internal-stylesheet.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/svg/internal-stylesheet.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/svg/internal-stylesheet.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/svg/presentation-attribute.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/svg/presentation-attribute.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/svg/presentation-attribute.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/svg/presentation-attribute.html	2019-09-15 11:33:27.000000000 +0000
@@ -7,8 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/svg/processing-instruction.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/svg/processing-instruction.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/css-integration/svg/processing-instruction.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/css-integration/svg/processing-instruction.html	2019-09-15 11:33:27.000000000 +0000
@@ -7,8 +7,7 @@
     <script src="/resources/testharnessreport.js"></script>
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/same-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/req.attr/unsafe-url/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.http-rp/unset/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc-inherit.meta/unset/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/srcdoc.meta/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for a-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for a-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for worker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for worker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for worker-module to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for worker-module to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/origin-when-cross-origin/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for a-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for a-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for fetch to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for iframe-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for script-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/same-origin/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects omitted for xhr to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for worker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for worker-module to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for a-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for fetch to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for iframe-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for script-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects origin for xhr to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unsafe-url/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.http-rp/unset/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/no-referrer-when-downgrade/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="no-referrer-when-downgrade">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/origin-when-cross-origin/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/same-origin/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="same-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/strict-origin-when-cross-origin/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="strict-origin-when-cross-origin">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unsafe-url/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
     <meta name="referrer" content="unsafe-url">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/a-tag/same-https.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for a-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/fetch/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for fetch to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/iframe-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for iframe-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/img-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for img-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.keep-origin.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-https.swap-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/script-tag/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for script-tag to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/sharedworker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for sharedworker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-classic/same-http.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-classic to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/worker-module/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for worker-module to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.no-redirect.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/cross-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to cross-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.keep-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.no-redirect.http.html	2019-09-15 11:33:27.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.keep-origin.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and keep-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.no-redirect.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and no-redirect redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-https.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-https origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/gen/top.meta/unset/xhr/same-http.swap-origin.http.html	2019-09-15 11:33:28.000000000 +0000
@@ -10,7 +10,7 @@
     <meta name="assert" content="Referrer Policy: Expects stripped-referrer for xhr to same-http origin and swap-origin redirection from http context.">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/test-case.sub.js"></script>
   </head>
   <body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-data.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-data.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-data.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-data.html	2019-09-15 11:33:28.000000000 +0000
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
@@ -21,7 +21,7 @@
       function runTest() {
         const BASE = location.protocol + "//www1." + location.hostname + ":" + location.port;
         const TEST_DATA =
-            `data:text/html,<script src = "${BASE}/common/security-features/resources/common.js"></` + `script>
+            `data:text/html,<script src = "${BASE}/common/security-features/resources/common.sub.js"></` + `script>
             <script src = "${BASE}/referrer-policy/generic/referrer-policy-test-case.js"></` + `script>
             <script>
               var urlPath = "/common/security-features/subresource/xhr.py";
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc-child.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <script src="/referrer-policy/generic/referrer-policy-test-case.js"></script>
     <meta name="referrer" content="origin">
   </head>
@@ -28,7 +28,7 @@
           iframe.onload = null;
           var iframeChild =  iframe.contentDocument.createElement("iframe");
           iframeChild.srcdoc =
-            `<script src = "${BASE}/common/security-features/resources/common.js"></sc` + `ript>
+            `<script src = "${BASE}/common/security-features/resources/common.sub.js"></sc` + `ript>
             <script src = "${BASE}/referrer-policy/generic/referrer-policy-test-case.js"></sc` + `ript>
             <script>
               var urlPath = "/common/security-features/subresource/xhr.py";
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body onload="runTest()">
@@ -22,15 +21,7 @@
       function runTest() {
         var iframe = document.createElement("iframe");
         iframe.srcdoc =
-<<<<<<<
-            `<script src = "/common/security-features/resources/common.js"></` + `script>
-            <script src = "/referrer-policy/generic/referrer-policy-test-case.js"></` + `script>
-=======
-        document.body.appendChild(iframe);
-        iframe.contentDocument.write(`
-            <script src = "/common/security-features/resources/common.js"></` + `script>
-            <script src = "/referrer-policy/generic/referrer-policy-test-case.sub.js"></` + `script>
->>>>>>>
+            `<script src = "/common/security-features/resources/common.sub.js"></` + `script>
             <script>
               var urlPath = "/common/security-features/subresource/xhr.py";
               var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/link-rel-prefetch.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/link-rel-prefetch.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/link-rel-prefetch.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/link-rel-prefetch.html	2019-09-15 11:33:28.000000000 +0000
@@ -5,7 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
     <meta name="referrer" content="origin">
     <link rel="prefetch" href="/common/security-features/subresource/image.py">
   </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/multiple-headers-and-values.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/multiple-headers-and-values.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/multiple-headers-and-values.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/multiple-headers-and-values.html	2019-09-15 11:33:29.000000000 +0000
@@ -5,8 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy header and header values are allowed</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/multiple-headers-combined.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/multiple-headers-combined.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/multiple-headers-combined.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/multiple-headers-combined.html	2019-09-15 11:33:28.000000000 +0000
@@ -5,8 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy header values are allowed</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/multiple-headers.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/multiple-headers.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/multiple-headers.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/multiple-headers.html	2019-09-15 11:33:29.000000000 +0000
@@ -5,8 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers are allowed</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-invalid.html	2019-09-15 11:33:28.000000000 +0000
@@ -5,8 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers with one invalid</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/multiple-headers-one-unknown-token.html	2019-09-15 11:33:27.000000000 +0000
@@ -5,8 +5,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
 
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers with one invalid</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/referrer-policy-test-case.sub.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/referrer-policy-test-case.sub.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/referrer-policy-test-case.sub.js	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/referrer-policy-test-case.sub.js	1970-01-01 00:00:00.000000000 +0000
@@ -1,260 +0,0 @@
-// TODO: This function is currently placed and duplicated at:
-// - mixed-content/generic/mixed-content-test-case.js
-// - referrer-policy/generic/referrer-policy-test-case.sub.js
-// but should be moved to /common/security-features/resources/common.js.
-function getSubresourceOrigin(originType) {
-  const httpProtocol = "http";
-  const httpsProtocol = "https";
-  const wsProtocol = "ws";
-  const wssProtocol = "wss";
-
-  const sameOriginHost = "{{host}}";
-  const crossOriginHost = "{{domains[www1]}}";
-
-  // These values can evaluate to either empty strings or a ":port" string.
-  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
-  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
-  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
-  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
-
-  /**
-    @typedef OriginType
-    @type {string}
-
-    Represents the origin of the subresource request URL.
-    The keys of `originMap` below are the valid values.
-
-    Note that there can be redirects from the specified origin
-    (see RedirectionType), and thus the origin of the subresource
-    response URL might be different from what is specified by OriginType.
-  */
-  const originMap = {
-    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
-    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
-    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
-    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
-    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
-    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
-    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
-    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
-  };
-
-  return originMap[originType];
-}
-
-// NOTE: This method only strips the fragment and is not in accordance to the
-// recommended draft specification:
-// https://w3c.github.io/webappsec/specs/referrer-policy/#null
-// TODO(kristijanburnik): Implement this helper as defined by spec once added
-// scenarios for URLs containing username/password/etc.
-function stripUrlForUseAsReferrer(url) {
-  return url.replace(/#.*$/, "");
-}
-
-function invokeScenario(scenario, sourceContextList) {
-  const originTypeConversion = {
-    "same-origin-http": "same-http",
-    "same-origin-https": "same-https",
-    "cross-origin-http": "cross-http",
-    "cross-origin-https": "cross-https"
-  };
-  const urls = getRequestURLs(
-    scenario.subresource,
-    originTypeConversion[scenario.origin + '-' + scenario.target_protocol],
-    scenario.redirection);
-
-  const deliveryTypeConversion = {
-    "attr-referrer": "attr",
-    "rel-noreferrer": "rel-noref",
-    // Other delivery methods such as "http-rp" are ignored here because
-    // they are already applied to the main document by generator.py.
-  };
-
-  /** @type {PolicyDelivery} */
-  const delivery = {
-      deliveryType: deliveryTypeConversion[scenario.delivery_method],
-      key: "referrerPolicy",
-      value: scenario.referrer_policy};
-
-  /** @type {Subresource} */
-  const subresource = {
-    subresourceType: scenario.subresource,
-    url: urls.testUrl,
-    policyDeliveries: [delivery]
-  };
-
-  return invokeRequest(subresource, sourceContextList || []);
-}
-
-function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
-  // Pass and skip rest of the test if browser does not support fetch.
-  if (scenario.subresource == "fetch-request" && !window.fetch) {
-    // TODO(kristijanburnik): This should be refactored.
-    return {
-      start: function() {
-        test(function() { assert_true(true); },
-             "[ReferrerPolicyTestCase] Skipping test: Fetch is not supported.");
-      }
-    };
-  }
-
-  // This check is A NOOP in release.
-  sanityChecker.checkScenario(scenario);
-
-  const referrerUrlResolver = {
-    "omitted": function(sourceUrl) {
-      return undefined;
-    },
-    "origin": function(sourceUrl) {
-      return new URL(sourceUrl).origin + "/";
-    },
-    "stripped-referrer": function(sourceUrl) {
-      return stripUrlForUseAsReferrer(sourceUrl);
-    }
-  };
-
-  const checkResult = (expectation, result) => {
-    let currentURL = location.toString();
-    const expectedReferrerUrl =
-      referrerUrlResolver[expectation](currentURL);
-
-    // Check the reported URL.
-    assert_equals(result.referrer,
-                  expectedReferrerUrl,
-                  "Reported Referrer URL is '" +
-                  expectation + "'.");
-    assert_equals(result.headers.referer,
-                  expectedReferrerUrl,
-                  "Reported Referrer URL from HTTP header is '" +
-                  expectedReferrerUrl + "'");
-  };
-
-  function runTest() {
-    function historyBackPromise(t, scenario) {
-      history.back();
-      return new Promise(resolve => {
-          // Wait for completion of `history.back()` by listening the
-          // popstate events that are fired near the end of
-          // `history.back()` processing.
-          window.addEventListener('popstate', resolve, {once: true});
-
-          // Workaround for Safari: Waiting for popstate events causes
-          // timeout in a-tag tests. To avoid timeout, we anyway resolve
-          // the promise.
-          if (scenario.subresource === 'a-tag') {
-            t.step_timeout(resolve, 1000);
-          }
-        });
-    }
-
-    // Request in the top-level document.
-    promise_test(_ => {
-      return invokeScenario(scenario)
-        .then(result => checkResult(scenario.referrer_url, result));
-    }, testDescription);
-
-    // `Referer` headers with length over 4k are culled down to an origin, so,
-    // let's test around that boundary for tests that would otherwise return
-    // the complete URL.
-    // Different subresource URLs are used because getRequestURLs() is called
-    // for each sub test which returns a unique URL.
-    if (scenario.referrer_url == "stripped-referrer") {
-      promise_test(t => {
-        history.pushState(null, null, "/");
-        history.replaceState(null, null, "A".repeat(4096 - location.href.length - 1));
-        return invokeScenario(scenario)
-          .then(result => checkResult(scenario.referrer_url, result))
-          .finally(_ => historyBackPromise(t, scenario));
-      }, "`Referer` header with length < 4k is not stripped to an origin.");
-
-      promise_test(t => {
-        history.pushState(null, null, "/");
-        history.replaceState(null, null, "A".repeat(4096 - location.href.length));
-        return invokeScenario(scenario)
-          .then(result => checkResult(scenario.referrer_url, result))
-          .finally(_ => historyBackPromise(t, scenario));
-      }, "`Referer` header with length == 4k is not stripped to an origin.");
-
-      promise_test(t => {
-        history.pushState(null, null, "/");
-        history.replaceState(null, null, "A".repeat(4096 - location.href.length + 1));
-        return invokeScenario(scenario)
-          .then(result => checkResult("origin", result))
-          .finally(_ => historyBackPromise(t, scenario));
-      }, "`Referer` header with length > 4k is stripped to an origin.");
-    }
-
-    // We test requests from inside iframes only for <img> tags.
-    // This is just to preserve the previous test coverage.
-    // TODO(hiroshige): Enable iframe tests for all subresource types.
-    if (scenario.subresource !== "img-tag") {
-      return;
-    }
-
-    // We skip <srcdoc> tests for attr-referrer, because delivering referrer
-    // policy via DOM attributes inside <srcdoc> is quite similar to doing
-    // so in the top-level Document.
-    if (scenario.delivery_method === "attr-referrer") {
-      return;
-    }
-
-    // Request in a `srcdoc` frame to ensure that it uses the referrer
-    // policy of its parent,
-    promise_test(_ => {
-        /** @type {Array<SourceContext>} */
-        const sourceContextList = [{sourceContextType: "srcdoc"}];
-
-        return invokeScenario(scenario, sourceContextList)
-          .then(result => checkResult(scenario.referrer_url, result));
-      }, testDescription + " (srcdoc iframe inherits parent)");
-
-    // We skip (top Document w/ referrer policy by HTTP headers)->
-    // (<iframe srcdoc> w/ overriding referrer policy) tests, because we
-    // already have similar (top Document w/ referrer policy by <meta>)->
-    // (<iframe srcdoc> w/ overriding referrer policy) tests.
-    if (scenario.delivery_method === "http-rp") {
-      return;
-    }
-
-    // We skip (top Document w/o referrer policy)->
-    // (<iframe srcdoc> w/ overriding referrer policy) tests, to simplify the
-    // generator. We already have (top Document w/ referrer policy)->
-    // (<iframe srcdoc> w/ overriding referrer policy) tests, which verify the
-    // <iframe srcdoc>'s referrer policy behavior.
-    if (scenario.referrer_policy === null) {
-      return;
-    }
-
-    // Request in a `srcdoc` frame with its own referrer policy to
-    // override its parent.
-    promise_test(_ => {
-        // Give a srcdoc iframe a referrer policy different from the
-        // top-level page's policy.
-        const overridingPolicy =
-            scenario.referrer_policy === "no-referrer" ? "unsafe-url"
-                                                       : "no-referrer";
-        const overrridingExpectation =
-            overridingPolicy === "no-referrer" ? "omitted"
-                                               : "stripped-referrer";
-
-        const scenarioWithoutDelivery = Object.assign({}, scenario);
-        // Omit policy deliveries applied to subresource requests.
-        // This is hacky method but will be removed soon.
-        scenarioWithoutDelivery.delivery_method = null;
-
-        // <iframe srcdoc> with overriding <meta> referrerPolicy.
-        /** @type {Array<SourceContext>} */
-        const sourceContextList = [{
-            sourceContextType: "srcdoc",
-            policyDeliveries: [{deliveryType: "meta",
-                                key: "referrerPolicy",
-                                value: overridingPolicy}]
-          }];
-
-        return invokeScenario(scenarioWithoutDelivery, sourceContextList)
-          .then(result => checkResult(overrridingExpectation, result));
-      }, testDescription + " (overridden by srcdoc iframe)");
-  }
-
-  return {start: runTest};
-}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html	2019-09-15 11:33:28.000000000 +0000
@@ -7,8 +7,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: A document with an opaque origin doesn't send referrers</h1>
@@ -26,8 +25,7 @@
           iframe.sandbox = sandboxAttributes;
           iframe.srcdoc = `
               <meta name = "referrer" content = "always">
-              <script src = "/common/security-features/resources/common.js"></` + `script>
-              <script src = "/referrer-policy/generic/referrer-policy-test-case.sub.js"></` + `script>
+              <script src = "/common/security-features/resources/common.sub.js"></` + `script>
               <script>
                 var urlPath = "/common/security-features/subresource/xhr.py";
                 var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/area-navigate.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/area-navigate.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/area-navigate.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/area-navigate.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Area Link messaging - cross-origin Area Link navigation</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/fetch-messaging.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/fetch-messaging.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/fetch-messaging.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/fetch-messaging.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Fetch messaging - same-origin Fetch request</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/iframe-messaging.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/iframe-messaging.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/iframe-messaging.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/iframe-messaging.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Iframe messaging - cross-origin iframe request</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/image-decoding.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/image-decoding.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/image-decoding.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/image-decoding.html	2019-09-15 11:33:29.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Image decoding - cross-origin image request</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/link-navigate.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/link-navigate.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/link-navigate.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/link-navigate.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Link messaging - cross-origin Link navigation</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/script-messaging.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/script-messaging.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/script-messaging.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/script-messaging.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Script messaging - cross-origin Script request</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/worker-messaging.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/worker-messaging.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/worker-messaging.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/worker-messaging.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Worker messaging - same-origin Worker request</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/xhr-messaging.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/xhr-messaging.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/subresource-test/xhr-messaging.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/subresource-test/xhr-messaging.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>XHR messaging - cross-origin XHR request</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/test-case.sub.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/test-case.sub.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/test-case.sub.js	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/test-case.sub.js	2019-09-15 11:33:28.000000000 +0000
@@ -1,47 +1,3 @@
-// TODO: This function is currently placed and duplicated at:
-// - mixed-content/generic/mixed-content-test-case.js
-// - referrer-policy/generic/referrer-policy-test-case.sub.js
-// but should be moved to /common/security-features/resources/common.js.
-function getSubresourceOrigin(originType) {
-  const httpProtocol = "http";
-  const httpsProtocol = "https";
-  const wsProtocol = "ws";
-  const wssProtocol = "wss";
-
-  const sameOriginHost = "{{host}}";
-  const crossOriginHost = "{{domains[www1]}}";
-
-  // These values can evaluate to either empty strings or a ":port" string.
-  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
-  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
-  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
-  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
-
-  /**
-    @typedef OriginType
-    @type {string}
-
-    Represents the origin of the subresource request URL.
-    The keys of `originMap` below are the valid values.
-
-    Note that there can be redirects from the specified origin
-    (see RedirectionType), and thus the origin of the subresource
-    response URL might be different from what is specified by OriginType.
-  */
-  const originMap = {
-    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
-    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
-    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
-    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
-    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
-    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
-    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
-    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
-  };
-
-  return originMap[originType];
-}
-
 // NOTE: This method only strips the fragment and is not in accordance to the
 // recommended draft specification:
 // https://w3c.github.io/webappsec/specs/referrer-policy/#null
@@ -52,40 +8,13 @@
 }
 
 function invokeScenario(scenario) {
-  const redirectionTypeConversion = {
-    "no-redirect": "no-redirect",
-    "keep-scheme": "keep-scheme-redirect",
-    "swap-scheme": "swap-scheme-redirect",
-    "keep-origin": "keep-origin-redirect",
-    "swap-origin": "swap-origin-redirect"
-  };
-  const subresourceTypeConversion = {
-    "beacon": "beacon-request",
-    "fetch": "fetch-request",
-    "xhr": "xhr-request",
-    "websocket": "websocket-request",
-    "worker-classic": "worker-request",
-    "worker-module": "module-worker",
-    "worker-import-data": "module-data-worker-import",
-    "sharedworker-classic": "shared-worker",
-    "worklet-animation": "worklet-animation-top-level",
-    "worklet-audio": "worklet-audio-top-level",
-    "worklet-layout": "worklet-layout-top-level",
-    "worklet-paint": "worklet-paint-top-level",
-    "worklet-animation-import-data": "worklet-animation-data-import",
-    "worklet-audio-import-data": "worklet-audio-data-import",
-    "worklet-layout-import-data": "worklet-layout-data-import",
-    "worklet-paint-import-data": "worklet-paint-data-import"
-  };
-  const subresourceType =
-      subresourceTypeConversion[scenario.subresource] || scenario.subresource;
   const urls = getRequestURLs(
-    subresourceType,
+    scenario.subresource,
     scenario.origin,
-    redirectionTypeConversion[scenario.redirection]);
+    scenario.redirection);
   /** @type {Subresource} */
   const subresource = {
-    subresourceType: subresourceType,
+    subresourceType: scenario.subresource,
     url: urls.testUrl,
     policyDeliveries: scenario.subresource_policy_deliveries,
   };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/referrer-policy/generic/unsupported-csp-referrer-directive.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,8 +6,7 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
-    <script src="/common/security-features/resources/common.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
+    <script src="/common/security-features/resources/common.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: CSP 'referrer' directive should not be supported</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/resources/chromium/nfc-mock.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/resources/chromium/nfc-mock.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/resources/chromium/nfc-mock.js	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/resources/chromium/nfc-mock.js	2019-09-15 11:33:29.000000000 +0000
@@ -1,20 +1,5 @@
 'use strict';
 
-function toMojoNDEFRecordType(type) {
-  switch (type) {
-  case 'text':
-    return device.mojom.NDEFRecordType.TEXT;
-  case 'url':
-    return device.mojom.NDEFRecordType.URL;
-  case 'json':
-    return device.mojom.NDEFRecordType.JSON;
-  case 'opaque':
-    return device.mojom.NDEFRecordType.OPAQUE_RECORD;
-  }
-
-  return device.mojom.NDEFRecordType.EMPTY;
-}
-
 function toMojoNFCPushTarget(target) {
   switch (target) {
   case 'peer':
@@ -48,7 +33,7 @@
 
 function toMojoNDEFRecord(record) {
   let nfcRecord = new device.mojom.NDEFRecord();
-  nfcRecord.recordType = toMojoNDEFRecordType(record.recordType);
+  nfcRecord.recordType = record.recordType;
   nfcRecord.mediaType = record.mediaType;
   nfcRecord.data = toByteArray(record.data);
   return nfcRecord;
@@ -74,8 +59,7 @@
 // TODO: Use different getters to get received record data,
 // see spec changes at https://github.com/w3c/web-nfc/pull/243
 function compareNDEFRecords(providedRecord, receivedRecord) {
-  assert_equals(toMojoNDEFRecordType(providedRecord.recordType),
-                receivedRecord.recordType);
+  assert_equals(providedRecord.recordType, receivedRecord.recordType);
 
   // Compare media types without charset.
   // Charset should be compared when watch method is implemented, in order
@@ -83,8 +67,7 @@
   assert_equals(providedRecord.mediaType,
       receivedRecord.mediaType.substring(0, providedRecord.mediaType.length));
 
-  assert_false(toMojoNDEFRecordType(providedRecord.recordType) ==
-              device.mojom.NDEFRecordType.EMPTY);
+  assert_not_equals(providedRecord.recordType, 'empty');
 
   assert_array_equals(toByteArray(providedRecord.data),
                       new Uint8Array(receivedRecord.data));
@@ -140,8 +123,7 @@
 
   if (provided.recordType !== undefined) {
     assert_equals(!+received.record_filter, true);
-    assert_equals(toMojoNDEFRecordType(provided.recordType),
-        received.recordFilter.recordType);
+    assert_equals(provided.recordType, received.recordFilter.recordType);
   }
 }
 
@@ -169,9 +151,8 @@
         && options.mediaType !== record.mediaType) {
       return false;
     }
-    if (options.recordFilter != null
-        && options.recordFilter.recordType
-            !== toMojoNDEFRecordType(record.recordType)) {
+    if (options.recordFilter != null &&
+        options.recordFilter.recordType !== record.recordType) {
       return false;
     }
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/resources/chromium/webxr-test.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/resources/chromium/webxr-test.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/resources/chromium/webxr-test.js	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/resources/chromium/webxr-test.js	2019-09-15 11:33:28.000000000 +0000
@@ -45,12 +45,9 @@
           m14, m24, m34, 1];
 }
 
-function getGFXTransformFromPosition(x, y, z) {
+function composeGFXTransform(fakeTransformInit) {
   let transform = new gfx.mojom.Transform();
-  transform.matrix = getMatrixFromTransform({
-    position: [x, y, z],
-    orientation: [0, 0, 0, 1]
-  });
+  transform.matrix = getMatrixFromTransform(fakeTransformInit);
   return transform;
 }
 
@@ -378,7 +375,10 @@
           leftDegrees: 50.899,
           rightDegrees: 35.197
         },
-        headFromEye: getGFXTransformFromPosition(-0.032, 0, 0),
+        headFromEye: composeGFXTransform({
+          position: [-0.032, 0, 0],
+          orientation: [0, 0, 0, 1]
+        }),
         renderWidth: 20,
         renderHeight: 20
       },
@@ -389,7 +389,10 @@
           leftDegrees: 50.899,
           rightDegrees: 35.197
         },
-        headFromEye: getGFXTransformFromPosition(0.032, 0, 0),
+        headFromEye: composeGFXTransform({
+          position: [0.032, 0, 0],
+          orientation: [0, 0, 0, 1]
+        }),
         renderWidth: 20,
         renderHeight: 20
       },
@@ -415,8 +418,6 @@
     let upTan = (1 + m[9]) / m[5];
     let downTan = (1 - m[9]) / m[5];
 
-    let offset = fakeXRViewInit.viewOffset.position;
-
     return {
       fieldOfView: {
         upDegrees: toDegrees(upTan),
@@ -424,7 +425,7 @@
         leftDegrees: toDegrees(leftTan),
         rightDegrees: toDegrees(rightTan)
       },
-      headFromEye: getGFXTransformFromPosition(offset[0], offset[1], offset[2]),
+      headFromEye: composeGFXTransform(fakeXRViewInit.viewOffset),
       renderWidth: fakeXRViewInit.resolution.width,
       renderHeight: fakeXRViewInit.resolution.height
     };
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/resource-timing/resource_ignore_failures.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/resource-timing/resource_ignore_failures.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/resource-timing/resource_ignore_failures.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/resource-timing/resource_ignore_failures.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-<title>Resource Timing ignores failed resources</title>
-<link rel="author" title="Google" href="http://www.google.com/" />
-<link rel="help" href="http://www.w3.org/TR/resource-timing/#dom-performanceresourcetiming-initiatortype"/>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/webperftestharness.js"></script>
-<script src="resources/webperftestharnessextension.js"></script>
-<script>
-let iframe;
-function setup_iframe() {
-    const iframe_content = '<img src="resources/non-existing-file.png"></img>';
-    iframe = document.getElementById('frameContext');
-    iframe.contentWindow.document.write(iframe_content);
-}
-function onload_test() {
-    const context = new PerformanceContext(iframe.contentWindow.performance);
-    const entries = context.getEntriesByType('resource');
-    test_true(entries.length == 0, "entries.length == 0");
-}
-window.setup_iframe = setup_iframe;
-</script>
-</head>
-<body>
-<h1>Description</h1>
-<p>This test validates that failed resources aren't present in the Resource Timing buffer.</p>
-<div id="log"></div>
-<iframe id="frameContext" onload="onload_test();" src="resources/inject_resource_test.html"></iframe>
-</body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/resource-timing/resources/status-code.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/resource-timing/resources/status-code.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/resource-timing/resources/status-code.py	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/resource-timing/resources/status-code.py	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,4 @@
+def main(request, response):
+    status = request.GET.first('status')
+    response.status = (status, "");
+
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/resource-timing/status-codes-create-entry.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/resource-timing/status-codes-create-entry.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/resource-timing/status-codes-create-entry.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/resource-timing/status-codes-create-entry.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<img src="resources/status-code.py?status=200">
+<img src="resources/status-code.py?status=307">
+<img src="resources/status-code.py?status=404">
+<img src="resources/status-code.py?status=502">
+<script>
+async_test(t => {
+  window.addEventListener("load", t.step_func(() => {
+    const images = document.getElementsByTagName("img");
+    for (let img of images) {
+      assert_equals(performance.getEntriesByName(img.src).length, 1, img.src);
+    }
+    t.done();
+  }));
+}, "Make sure all status codes are reported");
+</script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/scroll-to-text-fragment/scroll-to-text-fragment.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/scroll-to-text-fragment/scroll-to-text-fragment.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/scroll-to-text-fragment/scroll-to-text-fragment.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/scroll-to-text-fragment/scroll-to-text-fragment.html	2019-09-15 11:33:28.000000000 +0000
@@ -7,33 +7,38 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script>
 let test_cases = [
-  { fragment: '#', expect_scroll: false },
-  { fragment: '##targetText=test', expect_scroll: true },
-  { fragment: '##targetText=this,page', expect_scroll: true },
-  { fragment: '##targetText=this-,is,test', expect_scroll: true },
-  { fragment: '##targetText=this-,is,test,-page', expect_scroll: true },
-  { fragment: '##targetText=this-,is,page,-none', expect_scroll: false },
-  { fragment: '##targetText=this,test,-page', expect_scroll: true },
-  { fragment: '##targetText=this%20is%20a%20test%20page', expect_scroll: true },
-  { fragment: '##targetText=this&targetText=test,page', expect_scroll: true },
-  { fragment: '#pagestate##targetText=test', expect_scroll: true },
-  { fragment: '#pagestate##targetText=nomatch', expect_scroll: false },
-  { fragment: '#element##targetText=nomatch', expect_scroll: true },
+  { fragment: '#', expect_position: 'top' },
+  { fragment: '##targetText=test', expect_position: 'text' },
+  { fragment: '##targetText=this,page', expect_position: 'text' },
+  { fragment: '##targetText=this-,is,test', expect_position: 'text' },
+  { fragment: '##targetText=this-,is,test,-page', expect_position: 'text' },
+  { fragment: '##targetText=this-,is,page,-none', expect_position: 'top' },
+  { fragment: '##targetText=this,test,-page', expect_position: 'text' },
+  { fragment: '##targetText=this%20is%20a%20test%20page', expect_position: 'text' },
+  { fragment: '##targetText=this&targetText=test,page', expect_position: 'text' },
+  { fragment: '#pagestate##targetText=test', expect_position: 'text' },
+  { fragment: '#pagestate##targetText=nomatch', expect_position: 'top' },
+  { fragment: '#element##targetText=nomatch', expect_position: 'element' },
+  { fragment: '#element##directive', expect_position: 'element' },
 ];
 
+test(t => {
+  assert_equals(typeof(window.location.selector), 'object', 'window.location.selector is defined');
+}, 'Scroll to text is feature detectable via window.location.selector');
+
 for (const test_case of test_cases) {
   promise_test(t => new Promise(resolve => {
     let channel = new BroadcastChannel('scroll-to-text-fragment');
     channel.addEventListener("message", e => {
-      resolve(e.data.didScrollToTarget);
+      resolve(e.data.scrollPosition);
     }, {once: true});
 
     test_driver.bless('Open a URL with a text fragment anchor', () => {
       window.open('scroll-to-text-fragment-target.html' + test_case.fragment, '_blank', 'noopener');
     });
-  }).then(scroll => {
-    assert_equals(scroll, test_case.expect_scroll,
-                  'Expected ' + test_case.fragment + (test_case.expect_scroll ? ' to scroll.' : ' to not scroll.'));
+  }).then(scrollPosition => {
+    assert_equals(scrollPosition, test_case.expect_position,
+                  'Expected ' + test_case.fragment + ' to scroll to ' + test_case.expect_position);
   }), 'Test navigation with text fragment anchor ' + test_case.fragment);
 }
 </script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html	2019-09-15 11:33:29.000000000 +0000
@@ -1,9 +1,23 @@
 <!doctype html>
 <title>Navigating to a text fragment anchor</title>
 <script>
+function isInView(element) {
+  return (element.offsetTop >= window.scrollY) &&
+         (element.offsetTop <= (window.scrollY + window.innerHeight));
+}
+
 function checkScroll() {
   let bc = new BroadcastChannel('scroll-to-text-fragment');
-  bc.postMessage({ didScrollToTarget: window.scrollY > 0 });
+
+  var position = 'unknown';
+  if (window.scrollY == 0)
+    position = 'top';
+  else if (isInView(document.getElementById('element')))
+    position = 'element';
+  else if (isInView(document.getElementById('text')))
+    position = 'text';
+
+  bc.postMessage({ scrollPosition: position });
   bc.close();
   window.close();
 }
@@ -21,7 +35,7 @@
     top: 2000px;
   }
 </style>
-<body onload="checkScroll()">
+<body onload="window.requestAnimationFrame(checkScroll)">
   <div id="element">Element</div>
   <p id="text">This is a test page</p>
 </body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/service-workers/service-worker/clients-matchall-frozen.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/service-workers/service-worker/clients-matchall-frozen.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/service-workers/service-worker/clients-matchall-frozen.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/service-workers/service-worker/clients-matchall-frozen.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -49,19 +49,6 @@
             });
         })
       .then(function(e) {
-          assert_equals(e.data.length, 1);
-          assert_object_equals(e.data[0], expected_window_2);
-        })
-      .then(function() {
-          var channel = new MessageChannel();
-
-          return new Promise(function(resolve) {
-              channel.port1.onmessage = resolve;
-              windows[1].navigator.serviceWorker.controller.postMessage(
-                  {port:channel.port2, options: {lifecycleState: "all"}, includeLifecycleState: true}, [channel.port2]);
-            });
-        })
-      .then(function(e) {
           assert_equals(e.data.length, 2);
           // No specific order is required, so support inversion.
           if (e.data[0][3] == new URL(scope + '#2', location)) {
@@ -71,32 +58,6 @@
             assert_object_equals(e.data[0], expected_window_1);
             assert_object_equals(e.data[1], expected_window_2);
           }
-        })
-      .then(function() {
-          var channel = new MessageChannel();
-
-          return new Promise(function(resolve) {
-              channel.port1.onmessage = resolve;
-              windows[1].navigator.serviceWorker.controller.postMessage(
-                  {port:channel.port2, options: {lifecycleState: "frozen"}, includeLifecycleState: true}, [channel.port2]);
-            });
-        })
-      .then(function(e) {
-          assert_equals(e.data.length, 1);
-          assert_object_equals(e.data[0], expected_window_1);
-        })
-      .then(function() {
-          var channel = new MessageChannel();
-
-          return new Promise(function(resolve) {
-              channel.port1.onmessage = resolve;
-              windows[1].navigator.serviceWorker.controller.postMessage(
-                  {port:channel.port2, options: {lifecycleState: "active"}, includeLifecycleState: true}, [channel.port2]);
-            });
-        })
-      .then(function(e) {
-          assert_equals(e.data.length, 1);
-          assert_object_equals(e.data[0], expected_window_2);
       });
 }, 'Test Clients.matchAll()');
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/service-workers/service-worker/resource-timing.sub.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/service-workers/service-worker/resource-timing.sub.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/service-workers/service-worker/resource-timing.sub.https.html	2019-09-13 05:13:32.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/service-workers/service-worker/resource-timing.sub.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -98,14 +98,12 @@
               resource: 'resources/missing.jpg',
               mode: 'same-origin',
               description: 'Network fallback load failure',
-              should_no_performance_entry: true,
           });
           verify({
               performance: performance,
               resource: 'resources/missing.jpg',
               mode: 'cross-origin',
               description: 'Network fallback cross-origin load failure',
-              should_no_performance_entry: true,
           });
           // Tests for respondWith(fetch()).
           verify({
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/service-workers/service-worker/update-registration-with-type.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/service-workers/service-worker/update-registration-with-type.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/service-workers/service-worker/update-registration-with-type.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/service-workers/service-worker/update-registration-with-type.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -2,7 +2,7 @@
 <meta charset="utf-8">
 <title>Service Worker: Update the registration with a different script type.</title>
 <!-- common.js is for guid() -->
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html	2019-09-15 11:33:28.000000000 +0000
@@ -250,7 +250,30 @@
 
 container.innerHTML = '';
 
-    </script>
-  </body>
+test(function(t) {
+  const container = document.createElement("div");
+  const span = document.createElement("span");
+  span.innerText = "foo";
+  document.body.appendChild(container);
+  container.appendChild(span);
+
+  let elements = document.elementsFromPoint(...pointInElement(span));
+  assert_equals(elements.length, 4);
+  assert_equals(elements[0], span);
+  assert_equals(elements[1], container);
+  assert_equals(elements[2].nodeName, 'BODY');
+  assert_equals(elements[3].nodeName, 'HTML');
+
+  const host = document.createElement("div");
+  const shadowRoot = host.attachShadow({ mode: "open" });
+  elements = shadowRoot.elementsFromPoint(...pointInElement(span));
+  assert_equals(elements.length, 4);
+  assert_equals(elements[0], span);
+  assert_equals(elements[1], container);
+  assert_equals(elements[2].nodeName, 'BODY');
+  assert_equals(elements[3].nodeName, 'HTML');
+}, "elementsFromPoint should return all elements under a point, even when context object is not connected");
+</script>
+</body>
 </html>
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/.taskcluster.yml firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/.taskcluster.yml
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/.taskcluster.yml	2019-09-13 05:13:28.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/.taskcluster.yml	2019-09-15 11:33:23.000000000 +0000
@@ -76,8 +76,6 @@
                   public/results:
                     path: /home/test/artifacts
                     type: directory
-                env:
-                    TASK_EVENT: "${event_str}"
                 command:
                   - /bin/bash
                   - --login
@@ -106,6 +104,9 @@
                         --test-type=${chunk[0]}
                         --this-chunk=${chunk[1]}
                         --total-chunks=${chunk[2]};
+              extra:
+                github_event: "${event_str}"
+
       - $if: tasks_for == "github-pull-request"
         # PR tasks that run the tests in various configurations
         then:
@@ -168,8 +169,6 @@
                     public/results:
                       path: /home/test/artifacts
                       type: directory
-                  env:
-                    TASK_EVENT: "${event_str}"
                   # Fetch the GitHub-provided merge commit (rather than the pull
                   # request branch) so that the tasks simulate the behavior of the
                   # submitted patch after it is merged. Using the merge commit also
@@ -199,6 +198,9 @@
                           --
                           --channel=${browser.channel}
                           ${operation.extra_args};
+                extra:
+                  github_event: "${event_str}"
+
       - $map:
           # This is the main point to define new CI checks other than stability checks
         - name: lint
@@ -334,8 +336,6 @@
                     public/results:
                       path: /home/test/artifacts
                       type: directory
-                  env:
-                    TASK_EVENT: "${event_str}"
                   command:
                     - /bin/bash
                     - --login
@@ -347,3 +347,5 @@
                         ${checkout_ref};
                       cd ~/web-platform-tests;
                       ${operation.script};
+                extra:
+                  github_event: "${event_str}"
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/ci/run_tc.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/ci/run_tc.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/ci/run_tc.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/ci/run_tc.py	2019-09-15 11:33:27.000000000 +0000
@@ -48,6 +48,9 @@
     from urllib.request import urlopen
 
 
+QUEUE_BASE = "https://queue.taskcluster.net/v1/task"
+
+
 root = os.path.abspath(
     os.path.join(os.path.dirname(__file__),
                  os.pardir,
@@ -245,14 +248,29 @@
         run(["git", "fetch", "--quiet", "origin", "%s:%s" % (branch, branch)])
 
 
-def main():
-    args = get_parser().parse_args()
+def fetch_event_data():
     try:
-        event = json.loads(os.environ["TASK_EVENT"])
+        task_id = os.environ["TASK_ID"]
     except KeyError:
-        print("WARNING: Missing TASK_EVENT environment variable")
+        print("WARNING: Missing TASK_ID environment variable")
         # For example under local testing
-        event = {}
+        return None
+
+    resp = urlopen("%s/%s" % (QUEUE_BASE, task_id))
+
+    task_data = json.load(resp)
+    event_data = task_data.get("extra", {}).get("github_event")
+    if event_data is not None:
+        return json.loads(event_data)
+
+
+def main():
+    args = get_parser().parse_args()
+
+    if "TASK_EVENT" in os.environ:
+        event = json.loads(os.environ["TASK_EVENT"])
+    else:
+        event = fetch_event_data()
 
     if event:
         set_variables(event)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/lint/lint.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/lint/lint.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/lint/lint.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/lint/lint.py	2019-09-15 11:33:28.000000000 +0000
@@ -680,6 +680,21 @@
     return errors
 
 
+ahem_font_re = re.compile(b"font.*:.*ahem", flags=re.IGNORECASE)
+ahem_stylesheet_re = re.compile(b"\/fonts\/ahem\.css", flags=re.IGNORECASE)
+
+
+def check_ahem_system_font(repo_root, path, f):
+    # type: (str, str, IO[bytes]) -> List[rules.Error]
+    if not path.endswith((".html", ".htm", ".xht", ".xhtml")):
+        return []
+    contents = f.read()
+    errors = []
+    if ahem_font_re.search(contents) and not ahem_stylesheet_re.search(contents):
+        errors.append(rules.AhemSystemFont.error(path))
+    return errors
+
+
 def check_path(repo_root, path):
     # type: (str, str) -> List[rules.Error]
     """
@@ -918,7 +933,8 @@
 path_lints = [check_file_type, check_path_length, check_worker_collision, check_ahem_copy,
               check_gitignore_file]
 all_paths_lints = [check_css_globally_unique]
-file_lints = [check_regexp_line, check_parsed, check_python_ast, check_script_metadata]
+file_lints = [check_regexp_line, check_parsed, check_python_ast, check_script_metadata,
+              check_ahem_system_font]
 
 # Don't break users of the lint that don't have git installed.
 try:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/lint/rules.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/lint/rules.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/lint/rules.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/lint/rules.py	2019-09-15 11:33:28.000000000 +0000
@@ -78,6 +78,11 @@
     description = "Don't add extra copies of Ahem, use /fonts/Ahem.ttf"
 
 
+class AhemSystemFont(Rule):
+    name = "AHEM SYSTEM FONT"
+    description = "Don't use Ahem as a system font, use /fonts/ahem.css"
+
+
 # TODO: Add tests for this rule
 class IgnoredPath(Rule):
     name = "IGNORED PATH"
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/lint/tests/test_file_lints.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/lint/tests/test_file_lints.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/lint/tests/test_file_lints.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/lint/tests/test_file_lints.py	2019-09-15 11:33:29.000000000 +0000
@@ -677,6 +677,45 @@
             assert errors == []
 
 
+def test_ahem_system_font():
+    code = b"""\
+<html>
+<style>
+body {
+  font-family: aHEm, sans-serif;
+}
+</style>
+</html>
+"""
+    error_map = check_with_files(code)
+    for (filename, (errors, kind)) in error_map.items():
+        check_errors(errors)
+
+        if filename.endswith((".htm", ".html", ".xht", ".xhtml")):
+            assert errors == [
+                ("AHEM SYSTEM FONT", "Don't use Ahem as a system font, use /fonts/ahem.css", filename, None)
+            ]
+
+
+def test_ahem_web_font():
+    code = b"""\
+<html>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+body {
+  font-family: aHEm, sans-serif;
+}
+</style>
+</html>
+"""
+    error_map = check_with_files(code)
+    for (filename, (errors, kind)) in error_map.items():
+        check_errors(errors)
+
+        if filename.endswith((".htm", ".html", ".xht", ".xhtml")):
+            assert errors == []
+
+
 open_mode_code = """
 def first():
     return {0}("test.png")
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/manifest/item.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/manifest/item.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/manifest/item.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/manifest/item.py	2019-09-15 11:33:28.000000000 +0000
@@ -329,12 +329,6 @@
     item_type = "visual"
 
 
-class Stub(URLManifestItem):
-    __slots__ = ()
-
-    item_type = "stub"
-
-
 class WebDriverSpecTest(URLManifestItem):
     __slots__ = ()
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/manifest/manifest.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/manifest/manifest.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/manifest/manifest.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/manifest/manifest.py	2019-09-15 11:33:28.000000000 +0000
@@ -5,7 +5,7 @@
 from six import iteritems, iterkeys, itervalues, string_types, binary_type, text_type
 
 from . import vcs
-from .item import (ConformanceCheckerTest, ManifestItem, ManualTest, RefTest, RefTestNode, Stub,
+from .item import (ConformanceCheckerTest, ManifestItem, ManualTest, RefTest, RefTestNode,
                    SupportFile, TestharnessTest, VisualTest, WebDriverSpecTest)
 from .log import get_logger
 from .sourcefile import SourceFile
@@ -51,7 +51,6 @@
                 "reftest": RefTest,
                 "reftest_node": RefTestNode,
                 "manual": ManualTest,
-                "stub": Stub,
                 "wdspec": WebDriverSpecTest,
                 "conformancechecker": ConformanceCheckerTest,
                 "visual": VisualTest,
@@ -471,6 +470,14 @@
         self._path_hash = {to_os_path(k): v for k, v in iteritems(obj["paths"])}
 
         for test_type, type_paths in iteritems(obj["items"]):
+            # Drop "stub" items, which are no longer supported but may be
+            # present when doing an incremental manifest update.
+            # See https://github.com/web-platform-tests/rfcs/pull/27 for background.
+            #
+            # TODO(MANIFESTv7): remove this condition
+            if test_type == "stub":
+                continue
+
             if test_type not in item_classes:
                 raise ManifestError
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/manifest/sourcefile.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/manifest/sourcefile.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/manifest/sourcefile.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/manifest/sourcefile.py	2019-09-15 11:33:28.000000000 +0000
@@ -33,7 +33,7 @@
 import html5lib
 
 from . import XMLParser
-from .item import (ManifestItem, Stub, ManualTest, WebDriverSpecTest, RefTestNode, TestharnessTest,
+from .item import (ManifestItem, ManualTest, WebDriverSpecTest, RefTestNode, TestharnessTest,
                    SupportFile, ConformanceCheckerTest, VisualTest)
 from .utils import ContextManagerBytesIO, cached_property
 
@@ -353,13 +353,6 @@
         return self.in_conformance_checker_dir()
 
     @property
-    def name_is_stub(self):
-        # type: () -> bool
-        """Check if the file name matches the conditions for the file to
-        be a stub file"""
-        return self.name_prefix("stub-")
-
-    @property
     def name_is_manual(self):
         # type: () -> bool
         """Check if the file name matches the conditions for the file to
@@ -793,15 +786,6 @@
                     self.rel_path
                 )]  # type: Tuple[Text, List[ManifestItem]]
 
-        elif self.name_is_stub:
-            rv = Stub.item_type, [
-                Stub(
-                    self.tests_root,
-                    self.rel_path,
-                    self.url_base,
-                    self.rel_url
-                )]
-
         elif self.name_is_manual:
             rv = ManualTest.item_type, [
                 ManualTest(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/manifest/tests/test_manifest.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/manifest/tests/test_manifest.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/manifest/tests/test_manifest.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/manifest/tests/test_manifest.py	2019-09-15 11:33:29.000000000 +0000
@@ -50,7 +50,7 @@
 @hs.composite
 def sourcefile_strategy(draw):
     item_classes = [item.TestharnessTest, item.RefTestNode,
-                    item.ManualTest, item.Stub, item.WebDriverSpecTest,
+                    item.ManualTest, item.WebDriverSpecTest,
                     item.ConformanceCheckerTest, item.SupportFile]
     cls = draw(hs.sampled_from(item_classes))
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wpt/android.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wpt/android.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wpt/android.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wpt/android.py	2019-09-15 11:33:28.000000000 +0000
@@ -5,18 +5,23 @@
 import subprocess
 
 import requests
-from mozrunner.devices import android_device
 
-android_device.TOOLTOOL_PATH = os.path.join(os.path.dirname(__file__),
-                                            os.pardir,
-                                            "third_party",
-                                            "tooltool",
-                                            "tooltool.py")
+android_device = None
 
 here = os.path.abspath(os.path.dirname(__file__))
 wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
 
 
+def do_delayed_imports():
+    global android_device
+    from mozrunner.devices import android_device
+    android_device.TOOLTOOL_PATH = os.path.join(os.path.dirname(__file__),
+                                                os.pardir,
+                                                "third_party",
+                                                "tooltool",
+                                                "tooltool.py")
+
+
 def get_parser_install():
     parser = argparse.ArgumentParser()
     parser.add_argument("--reinstall", action="store_true", default=False,
@@ -53,7 +58,7 @@
 
     os_name = platform.system().lower()
     if os_name not in ["darwin", "linux", "windows"]:
-        logger.error("Unsupported platform %s" % os_name)
+        logger.critical("Unsupported platform %s" % os_name)
         raise NotImplementedError
 
     os_name = 'darwin' if os_name == 'macosx' else os_name
@@ -103,6 +108,8 @@
 
 
 def get_emulator(sdk_path):
+    if android_device is None:
+        do_delayed_imports()
     if "ANDROID_SDK_ROOT" not in os.environ:
         os.environ["ANDROID_SDK_ROOT"] = sdk_path
     substs = {"top_srcdir": wpt_root, "TARGET_CPU": "x86"}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wpt/run.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wpt/run.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wpt/run.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wpt/run.py	2019-09-15 11:33:28.000000000 +0000
@@ -67,7 +67,7 @@
 
 def exit(msg=None):
     if msg:
-        logger.error(msg)
+        logger.critical(msg)
         sys.exit(1)
     else:
         sys.exit(0)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wpt/testfiles.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wpt/testfiles.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wpt/testfiles.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wpt/testfiles.py	2019-09-15 11:33:27.000000000 +0000
@@ -53,8 +53,8 @@
             logger.debug(" ".join(full_cmd))
             return subprocess.check_output(full_cmd, cwd=repo_path).decode("utf8").strip()
         except subprocess.CalledProcessError as e:
-            logger.error("Git command exited with status %i" % e.returncode)
-            logger.error(e.output)
+            logger.critical("Git command exited with status %i" % e.returncode)
+            logger.critical(e.output)
             sys.exit(1)
     return git
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/metadata.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/metadata.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/metadata.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/metadata.py	2019-09-15 11:33:27.000000000 +0000
@@ -500,7 +500,7 @@
     """
     do_delayed_imports()
     id_test_map = {}
-    exclude_types = frozenset(["stub", "manual", "support", "conformancechecker"])
+    exclude_types = frozenset(["manual", "support", "conformancechecker"])
     all_types = set(manifestitem.item_types.keys())
     assert all_types > exclude_types
     include_types = all_types - exclude_types
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/testharnessreport-servo.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/testharnessreport-servo.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/testharnessreport-servo.js	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/testharnessreport-servo.js	2019-09-15 11:33:28.000000000 +0000
@@ -4,7 +4,7 @@
 setup(props);
 
 add_completion_callback(function (tests, harness_status) {
-    var id = start_loc.pathname + start_loc.search + start_loc.hash;
+    var id = decodeURIComponent(start_loc.pathname) + decodeURIComponent(start_loc.search) + decodeURIComponent(start_loc.hash);
     console.log("ALERT: RESULT: " + JSON.stringify([
         id,
         harness_status.status,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py	2019-09-15 11:33:29.000000000 +0000
@@ -473,7 +473,7 @@
     def init(self):
         assert isinstance(self.state, RunnerManagerState.initializing)
         if self.state.failure_count > self.max_restarts:
-            self.logger.error("Max restarts exceeded")
+            self.logger.critical("Max restarts exceeded")
             return RunnerManagerState.error()
 
         self.browser.update_settings(self.state.test)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/tests/test_update.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/tests/test_update.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/tests/test_update.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/tests/test_update.py	2019-09-15 11:33:28.000000000 +0000
@@ -31,7 +31,6 @@
                 "reftest": manifest_item.RefTest,
                 "reftest_node": manifest_item.RefTestNode,
                 "manual": manifest_item.ManualTest,
-                "stub": manifest_item.Stub,
                 "wdspec": manifest_item.WebDriverSpecTest,
                 "conformancechecker": manifest_item.ConformanceCheckerTest,
                 "visual": manifest_item.VisualTest,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/update/update.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/update/update.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/update/update.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/update/update.py	2019-09-15 11:33:28.000000000 +0000
@@ -165,7 +165,7 @@
             return exit_clean
 
         if not self.kwargs["continue"] and not self.state.is_empty():
-            self.logger.error("Found existing state. Run with --continue to resume or --abort to clear state")
+            self.logger.critical("Found existing state. Run with --continue to resume or --abort to clear state")
             return exit_unclean
 
         if self.kwargs["continue"]:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptrunner/wptrunner/wptrunner.py	2019-09-15 11:33:27.000000000 +0000
@@ -169,10 +169,10 @@
         unexpected_total = 0
 
         if len(test_loader.test_ids) == 0 and kwargs["test_list"]:
-            logger.error("Unable to find any tests at the path(s):")
+            logger.critical("Unable to find any tests at the path(s):")
             for path in kwargs["test_list"]:
-                logger.error("  %s" % path)
-            logger.error("Please check spelling and make sure there are tests in the specified path(s).")
+                logger.critical("  %s" % path)
+            logger.critical("Please check spelling and make sure there are tests in the specified path(s).")
             return False
         kwargs["pause_after_test"] = get_pause_after_test(test_loader, **kwargs)
 
@@ -302,7 +302,7 @@
                 logger.info("No tests ran")
                 return True
             else:
-                logger.error("No tests ran")
+                logger.critical("No tests ran")
                 return False
 
     if unexpected_total and not kwargs["fail_on_unexpected"]:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptserve/wptserve/server.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptserve/wptserve/server.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/tools/wptserve/wptserve/server.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/tools/wptserve/wptserve/server.py	2019-09-15 11:33:27.000000000 +0000
@@ -676,7 +676,7 @@
 
             _host, self.port = self.httpd.socket.getsockname()
         except Exception:
-            self.logger.error("Failed to start HTTP server. {}".format(EDIT_HOSTS_HELP))
+            self.logger.critical("Failed to start HTTP server. {}".format(EDIT_HOSTS_HELP))
             raise
 
     def start(self, block=False):
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/trusted-types/block-eval.tentative.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/trusted-types/block-eval.tentative.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/trusted-types/block-eval.tentative.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/trusted-types/block-eval.tentative.html	2019-09-15 11:33:28.000000000 +0000
@@ -21,9 +21,7 @@
 
   test(t => {
     let a = 0;
-    assert_throws(new EvalError(), _ => {
-      eval(p.createScript('a="Hello transformed string"'));
-    });
+    eval(p.createScript('a="Hello transformed string"'));
     assert_equals(a, 0);
   }, "eval with TrustedScript throws (script-src blocks).");
 </script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -89,7 +89,6 @@
         .then(promise_violation("script-src"))
         .then(promise_flush());
     expect_throws(_ => eval('script_run_beacon="should not run"'));
-    // TODO(ssanfilippo) This should throw, but doesn't yet. See crbug.com/992424.
     eval(scriptyPolicy.createScript('script_run_beacon="i ran"'));
     flush();
     assert_not_equals(script_run_beacon, 'i ran'); // Code did not run.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-import-upgrade.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-redirect-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/animation-worklet-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-import-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-redirect-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/audio-worklet-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/iframe-redirect-upgrade.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/iframe-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/iframe-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/iframe-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/iframe-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/image-redirect-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/image-redirect-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/image-redirect-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/image-redirect-upgrade.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/image-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/image-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/image-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/image-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-import-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-redirect-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/layout-worklet-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/module-worker-import-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/module-worker-redirect-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/module-worker-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/module-worker-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/module-worker-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/module-worker-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-import-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-redirect-upgrade.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/paint-worklet-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/shared-worker-redirect-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/shared-worker-redirect-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/shared-worker-redirect-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/shared-worker-redirect-upgrade.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/shared-worker-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/shared-worker-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/shared-worker-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/shared-worker-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/support/generate.py firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/support/generate.py
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/support/generate.py	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/support/generate.py	2019-09-15 11:33:28.000000000 +0000
@@ -13,7 +13,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/worker-redirect-upgrade.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-redirect-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -7,7 +7,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/worker-subresource-fetch-upgrade.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/worker-upgrade.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/worker-upgrade.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/upgrade-insecure-requests/worker-upgrade.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/upgrade-insecure-requests/worker-upgrade.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -6,7 +6,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="./support/testharness-helper.sub.js"></script>
-<script src="/common/security-features/resources/common.js"></script>
+<script src="/common/security-features/resources/common.sub.js"></script>
 
 <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests">
 </head>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-animations/resources/keyframe-tests.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-animations/resources/keyframe-tests.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-animations/resources/keyframe-tests.js	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-animations/resources/keyframe-tests.js	2019-09-15 11:33:28.000000000 +0000
@@ -86,6 +86,16 @@
                       { marginTop: '60px', margin: '10px 20px 30px 40px' })],
   },
   {
+    desc:   'a two property (one shorthand and one of its shorthand components)'
+            + ' two value property-indexed keyframes specification',
+    input:  { border: ['pink', '2px'],
+              borderColor: ['green', 'blue'] },
+    output: [keyframe(computedOffset(0),
+                      { border: 'pink', borderColor: 'green' }),
+             keyframe(computedOffset(1),
+                      { border: '2px', borderColor: 'blue' })],
+  },
+  {
     desc:   'a two property two value property-indexed keyframes specification',
     input:  { left: ['10px', '20px'],
               top: ['30px', '40px'] },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-animations/timing-model/animations/canceling-an-animation.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-animations/timing-model/animations/canceling-an-animation.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-animations/timing-model/animations/canceling-an-animation.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-animations/timing-model/animations/canceling-an-animation.html	2019-09-15 11:33:27.000000000 +0000
@@ -66,6 +66,7 @@
   const promise = animation.ready;
   animation.cancel();
   assert_not_equals(animation.ready, promise);
+  promise_rejects(t, 'AbortError', promise, 'Cancel should abort ready promise');
 }, 'The ready promise should be replaced when the animation is canceled');
 
 promise_test(t => {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-nfc/idlharness.https.window.js firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-nfc/idlharness.https.window.js
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-nfc/idlharness.https.window.js	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-nfc/idlharness.https.window.js	2019-09-15 11:33:27.000000000 +0000
@@ -4,13 +4,17 @@
 'use strict';
 
 // https://w3c.github.io/web-nfc/
+
+const record = {
+  recordType: "text",
+  mediaType: "text/plain",
+  data: "Hello World",
+  id: "/custom/path"
+};
 const message = {
   url: "/custom/path",
-  records: [{
-    recordType: "text",
-    data: "Hello World"
-  }]
-}
+  records: [record]
+};
 
 idl_test(
   ['web-nfc'],
@@ -19,6 +23,8 @@
     idl_array.add_objects({
       NFCWriter: ['new NFCWriter();'],
       NFCReader: ['new NFCReader();'],
+      NDEFRecord: [`new NDEFRecord(${JSON.stringify(record)});`],
+      NDEFMessage: [`new NDEFMessage(${JSON.stringify(message)});`],
       NFCReadingEvent: [`new NFCReadingEvent("reading", { message: ${JSON.stringify(message)} })`],
       NFCErrorEvent: ['new NFCErrorEvent("error", { error: new DOMException() });'],
     });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-nfc/NDEFRecord_constructor.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-nfc/NDEFRecord_constructor.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-nfc/NDEFRecord_constructor.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-nfc/NDEFRecord_constructor.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -13,10 +13,26 @@
 
   test(() => {
     assert_throws(new TypeError, () => new NDEFRecord(null),
-        "The record has neither type nor data.");
+        'The record has neither type nor data.');
   }, 'NDEFRecord constructor with null init dict');
 
   test(() => {
+    const record = new NDEFRecord(createTextRecord(test_text_data));
+    assert_equals(record.recordType, 'text', 'recordType');
+    assert_equals(record.mediaType, 'text/plain', 'mediaType');
+    assert_equals(record.toText(), test_text_data,
+        'toText() has the same content with the original dictionary');
+  }, 'NDEFRecord constructor with text record type');
+
+  test(() => {
+    const record = new NDEFRecord(createUrlRecord(test_url_data));
+    assert_equals(record.recordType, 'url', 'recordType');
+    assert_equals(record.mediaType, 'text/plain', 'mediaType');
+    assert_equals(record.toText(), test_url_data,
+        'toText() has the same content with the original dictionary');
+  }, 'NDEFRecord constructor with url record type');
+
+  test(() => {
     let buffer = new ArrayBuffer(4);
     let buffer_view = new Uint8Array(buffer);
     let original_data = new Uint8Array([1, 2, 3, 4]);
@@ -68,4 +84,19 @@
         'toJSON() has the same content with the original dictionary');
   }, 'NDEFRecord constructor with json data');
 
+  test(() => {
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('EMptY')),
+        'Unknown record type.');
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('TeXt', '', test_text_data)),
+        'Unknown record type.');
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('uRL', '', test_url_data)),
+        'Unknown record type.');
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('jSoN', '', test_json_data)),
+        'Unknown record type.');
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('OpaQUE', '', test_buffer_data)),
+        'Unknown record type.');
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('sMart-PosTER', '', test_url_data)),
+        'Unknown record type.');
+  }, 'NDEFRecord constructor with record type string being treated as case sensitive');
+
 </script>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare-files.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare-files.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare-files.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare-files.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: canShare with files</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      'use strict';
-      const textFile = new File(['hello'], 'hello.txt', {type:'text/plain'});
-      const emptyFile = new File([''], 'empty');
-
-      test(() => {
-        assert_throws(new TypeError(), () => { navigator.canShare({files: textFile}) });
-      }, 'canShare with single file');
-
-      test(() => {
-        assert_equals(navigator.canShare({files: []}), false);
-      }, 'canShare with empty file list');
-
-      test(() => {
-        assert_equals(navigator.canShare({files: [emptyFile]}), true);
-      }, 'canShare with single file list');
-
-      test(() => {
-        assert_equals(navigator.canShare({files: [textFile, emptyFile]}), true);
-      }, 'canShare with file list');
-
-      test(() => {
-        assert_equals(navigator.canShare({files: [textFile, emptyFile, textFile]}), true);
-      }, 'canShare with repeated file');
-
-      test(() => {
-        assert_equals(navigator.canShare({url: 'https://example.com/', files: [textFile, emptyFile]}), true);
-      }, 'canShare with file list and url');
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare-files.tentative.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare-files.tentative.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare-files.tentative.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare-files.tentative.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: canShare with files</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      'use strict';
+      const textFile = new File(['hello'], 'hello.txt', {type:'text/plain'});
+      const emptyFile = new File([''], 'empty');
+
+      test(() => {
+        assert_throws(new TypeError(), () => { navigator.canShare({files: textFile}) });
+      }, 'canShare with single file');
+
+      test(() => {
+        assert_equals(navigator.canShare({files: []}), false);
+      }, 'canShare with empty file list');
+
+      test(() => {
+        assert_equals(navigator.canShare({files: [emptyFile]}), true);
+      }, 'canShare with single file list');
+
+      test(() => {
+        assert_equals(navigator.canShare({files: [textFile, emptyFile]}), true);
+      }, 'canShare with file list');
+
+      test(() => {
+        assert_equals(navigator.canShare({files: [textFile, emptyFile, textFile]}), true);
+      }, 'canShare with repeated file');
+
+      test(() => {
+        assert_equals(navigator.canShare({url: 'https://example.com/', files: [textFile, emptyFile]}), true);
+      }, 'canShare with file list and url');
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare.https.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: canShare without files</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      'use strict';
-
-      test(() => {
-        assert_equals(navigator.canShare(), false);
-      }, 'canShare with no arguments (same as empty dictionary)');
-
-      test(() => {
-        assert_equals(navigator.canShare({}), false);
-      }, 'canShare with an empty dictionary');
-
-      test(() => {
-        assert_equals(navigator.canShare(undefined), false);
-      }, 'canShare with a undefined argument (same as empty dictionary)');
-
-      test(() => {
-        assert_equals(navigator.canShare(null), false);
-      }, 'canShare with a null argument (same as empty dictionary)');
-
-      test(() => {
-        assert_equals(navigator.canShare({unused: 'unexpected field'}), false);
-      }, 'canShare with a dictionary containing only surplus fields');
-
-      test(() => {
-        // URL is invalid in that the URL Parser returns failure (port is too
-        // large).
-        const url = 'http://example.com:65536';
-        assert_equals(navigator.canShare({url}), false);
-      }, 'canShare with an invalid URL');
-
-      test(() => {
-        assert_equals(navigator.canShare({title: undefined}), false);
-      }, 'canShare with attribute undefined is equivalent to omitting the attribute');
-
-      test(() => {
-        assert_equals(navigator.canShare({title: 'subject'}), true);
-      }, 'canShare with title');
-
-      test(() => {
-        assert_equals(navigator.canShare({text: 'body'}), true);
-      }, 'canShare with text');
-
-      test(() => {
-        assert_equals(navigator.canShare({url: 'https://www.example.com/some/path?some_query#some_fragment'}), true);
-      }, 'canShare with URL');
-
-      test(() => {
-        assert_equals(navigator.canShare({title: null}), true);
-      }, 'canShare with null attribute');
-
-      test(() => {
-        assert_equals(navigator.canShare({text: 123}), true);
-      }, 'canShare with number');
-
-      test(() => {
-        assert_equals(navigator.canShare({url: {toString() { return 'https://example.com/'; }}}), true);
-      }, 'canShare with object');
-
-      test(() => {
-        assert_equals(navigator.canShare({title: 'subject', text: 'body', url: 'https://example.com/', unused: 'unexpected field'}), true);
-      }, 'canShare with unexpected field');
-
-      test(() => {
-        assert_equals(navigator.canShare({url: 'data:the url'}), true);
-      }, 'canShare with data URL');
-
-      test(() => {
-        assert_equals(navigator.canShare({url: ''}), true);
-      }, 'canShare with empty URL');
-
-      test(() => {
-        assert_equals(navigator.canShare({url: '//www.example.com/some/path?some_query#some_fragment'}), true);
-      }, 'canShare with URL having no scheme');
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare-insecure.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare-insecure.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare-insecure.http.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare-insecure.http.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: canShare from non-secure context</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-        test(() => {
-          assert_false('canShare' in navigator, 'navigator has attribute \'canShare\'.');
-        }, 'navigator.canShare must be undefined in non-secure context');
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare-insecure.tentative.http.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare-insecure.tentative.http.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare-insecure.tentative.http.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare-insecure.tentative.http.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: canShare from non-secure context</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+        test(() => {
+          assert_false('canShare' in navigator, 'navigator has attribute \'canShare\'.');
+        }, 'navigator.canShare must be undefined in non-secure context');
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare.tentative.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare.tentative.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/canShare.tentative.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/canShare.tentative.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: canShare without files</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+  </head>
+  <body>
+    <script>
+      'use strict';
+
+      test(() => {
+        assert_equals(navigator.canShare(), false);
+      }, 'canShare with no arguments (same as empty dictionary)');
+
+      test(() => {
+        assert_equals(navigator.canShare({}), false);
+      }, 'canShare with an empty dictionary');
+
+      test(() => {
+        assert_equals(navigator.canShare(undefined), false);
+      }, 'canShare with a undefined argument (same as empty dictionary)');
+
+      test(() => {
+        assert_equals(navigator.canShare(null), false);
+      }, 'canShare with a null argument (same as empty dictionary)');
+
+      test(() => {
+        assert_equals(navigator.canShare({unused: 'unexpected field'}), false);
+      }, 'canShare with a dictionary containing only surplus fields');
+
+      test(() => {
+        // URL is invalid in that the URL Parser returns failure (port is too
+        // large).
+        const url = 'http://example.com:65536';
+        assert_equals(navigator.canShare({url}), false);
+      }, 'canShare with an invalid URL');
+
+      test(() => {
+        assert_equals(navigator.canShare({title: undefined}), false);
+      }, 'canShare with attribute undefined is equivalent to omitting the attribute');
+
+      test(() => {
+        assert_equals(navigator.canShare({title: 'subject'}), true);
+      }, 'canShare with title');
+
+      test(() => {
+        assert_equals(navigator.canShare({text: 'body'}), true);
+      }, 'canShare with text');
+
+      test(() => {
+        assert_equals(navigator.canShare({url: 'https://www.example.com/some/path?some_query#some_fragment'}), true);
+      }, 'canShare with URL');
+
+      test(() => {
+        assert_equals(navigator.canShare({title: null}), true);
+      }, 'canShare with null attribute');
+
+      test(() => {
+        assert_equals(navigator.canShare({text: 123}), true);
+      }, 'canShare with number');
+
+      test(() => {
+        assert_equals(navigator.canShare({url: {toString() { return 'https://example.com/'; }}}), true);
+      }, 'canShare with object');
+
+      test(() => {
+        assert_equals(navigator.canShare({title: 'subject', text: 'body', url: 'https://example.com/', unused: 'unexpected field'}), true);
+      }, 'canShare with unexpected field');
+
+      test(() => {
+        assert_equals(navigator.canShare({url: 'data:the url'}), true);
+      }, 'canShare with data URL');
+
+      test(() => {
+        assert_equals(navigator.canShare({url: ''}), true);
+      }, 'canShare with empty URL');
+
+      test(() => {
+        assert_equals(navigator.canShare({url: '//www.example.com/some/path?some_query#some_fragment'}), true);
+      }, 'canShare with URL having no scheme');
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-cancel-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-cancel-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-cancel-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-cancel-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share cancelled by user</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        setupManualShareTestRequiringCancellation();
-
-        promise_test(t => {
-          return callWhenButtonClicked(() => promise_rejects(
-              t, 'AbortError',
-              navigator.share({title: 'the title', text: 'the message',
-                               url: 'data:the url'})));
-        }, 'share with user cancellation');
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-cancel-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-cancel-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-cancel-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-cancel-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share cancelled by user</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        setupManualShareTestRequiringCancellation();
+
+        promise_test(t => {
+          return callWhenButtonClicked(() => promise_rejects(
+              t, 'AbortError',
+              navigator.share({title: 'the title', text: 'the message',
+                               url: 'https://example.com'})));
+        }, 'share with user cancellation');
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-extra-argument-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-extra-argument-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-extra-argument-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-extra-argument-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Surplus arguments ignored</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        setupManualShareTest(
-            {title: 'the title', text: 'the message', url: 'data:the url'});
-        callWhenButtonClicked(() => navigator.share(
-              {title: 'the title', text: 'the message', url: 'data:the url'},
-              'more than required'));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-extra-argument-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-extra-argument-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-extra-argument-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-extra-argument-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Surplus arguments ignored</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        setupManualShareTest(
+            {title: 'the title', text: 'the message', url: 'https://example.com'});
+        callWhenButtonClicked(() => navigator.share(
+              {title: 'the title', text: 'the message', url: 'https://example.com'},
+              'more than required'));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-extra-field-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-extra-field-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-extra-field-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-extra-field-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Surplus fields ignored</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        setupManualShareTest(
-            {title: 'the title', text: 'the message', url: 'data:the url'});
-        callWhenButtonClicked(() => navigator.share(
-              {title: 'the title', text: 'the message', url: 'data:the url',
-               unused: 'unexpected field'}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-extra-field-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-extra-field-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-extra-field-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-extra-field-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Surplus fields ignored</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        setupManualShareTest(
+            {title: 'the title', text: 'the message', url: 'https://example.com'});
+        callWhenButtonClicked(() => navigator.share(
+              {title: 'the title', text: 'the message', url: 'https://example.com',
+               unused: 'unexpected field'}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-files-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-files-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-files-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-files-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share multiple files</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        const options = {type: 'text/plain'};
-        const first = new File(['one'], 'first.txt', options);
-        const second = new File(['two'], 'second.txt', options);
-        const third = new File(['three'], 'third.txt', options);
-        const fourth = new File(['four'], 'fourth.txt', options);
-        const fifth = new File(['five'], 'fifth.txt', options);
-        const data = {
-          title: 'Counting to 5',
-          text: 'Here are the numbers',
-          url: 'https://example.com/',
-          files: [first, second, third, fourth, fifth]
-        };
-        setupManualShareTest(data);
-        callWhenButtonClicked(() => navigator.share(data));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-files-manual.tentative.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-files-manual.tentative.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-files-manual.tentative.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-files-manual.tentative.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share multiple files</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        const options = {type: 'text/plain'};
+        const first = new File(['one'], 'first.txt', options);
+        const second = new File(['two'], 'second.txt', options);
+        const third = new File(['three'], 'third.txt', options);
+        const fourth = new File(['four'], 'fourth.txt', options);
+        const fifth = new File(['five'], 'fifth.txt', options);
+        const data = {
+          title: 'Counting to 5',
+          text: 'Here are the numbers',
+          url: 'https://example.com/',
+          files: [first, second, third, fourth, fifth]
+        };
+        setupManualShareTest(data);
+        callWhenButtonClicked(() => navigator.share(data));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-image-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-image-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-image-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-image-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share single image file</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        const fileBits = [
-          '<svg xmlns="http://www.w3.org/2000/svg" width="80px" height="80px">',
-          '<circle cx="40" cy="40" r="28" fill="lime" />',
-          '</svg>'
-        ];
-        const fileName = 'circle.svg';
-        const options = {type: 'image/svg+xml'};
-        const file = new File(fileBits, fileName, options);
-        setupManualShareTest({title: '', text: '', url: '', files: [file]});
-        callWhenButtonClicked(() => navigator.share({files: [file]}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-image-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-image-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-image-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-image-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share single image file</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        const fileBits = [
+          '<svg xmlns="http://www.w3.org/2000/svg" width="80px" height="80px">',
+          '<circle cx="40" cy="40" r="28" fill="lime" />',
+          '</svg>'
+        ];
+        const fileName = 'circle.svg';
+        const options = {type: 'image/svg+xml'};
+        const file = new File(fileBits, fileName, options);
+        setupManualShareTest({title: '', text: '', url: '', files: [file]});
+        callWhenButtonClicked(() => navigator.share({files: [file]}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-non-string-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-non-string-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-non-string-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-non-string-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share non-string types (test implicit conversion)</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        // Expect that each of the non-string values is converted into a string.
-        setupManualShareTest(
-            {title: 'true', text: 'the object', url: getAbsoluteUrl('384957')});
-
-        const objectWithToString = {toString() { return 'the object'; }};
-        callWhenButtonClicked(() => navigator.share(
-              {title: true, text: objectWithToString, url: 384957}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-non-string-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-non-string-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-non-string-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-non-string-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share non-string types (test implicit conversion)</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        // Expect that each of the non-string values is converted into a string.
+        setupManualShareTest(
+            {title: 'true', text: 'the object', url: getAbsoluteUrl('384957')});
+
+        const objectWithToString = {toString() { return 'the object'; }};
+        callWhenButtonClicked(() => navigator.share(
+              {title: true, text: objectWithToString, url: 384957}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-null-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-null-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-null-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-null-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share null and undefined values</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        // Expect null to be converted into the string 'null'. On the other
-        // hand, undefined should be equivalent to omitting the attribute.
-        setupManualShareTest(
-            {title: 'null', text: '', url: getAbsoluteUrl('null')});
-        callWhenButtonClicked(() => navigator.share(
-              {title: null, text: undefined, url: null}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-null-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-null-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-null-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-null-manual.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share null and undefined values</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        // Expect null to be converted into the string 'null'. On the other
+        // hand, undefined should be equivalent to omitting the attribute.
+        setupManualShareTest(
+            {title: 'null', text: '', url: getAbsoluteUrl('null')});
+        callWhenButtonClicked(() => navigator.share(
+              {title: null, text: undefined, url: null}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-sharePromise-internal-slot.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-sharePromise-internal-slot.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-sharePromise-internal-slot.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-sharePromise-internal-slot.https.html	2019-09-15 11:33:30.000000000 +0000
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <link rel="help" href="https://github.com/w3c/web-share/pull/113" />
+    <title>WebShare Test: only one share at a time</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+  </head>
+  <body>
+    <script>
+      promise_test(async t => {
+        const [, promise2, promise3] = await test_driver.bless(
+          "share needs user activation",
+          () => {
+            return [
+              navigator.share({ title: "should be pending" }),
+              navigator.share({ title: "should reject" }),
+              navigator.share({ title: "should also reject" }),
+            ];
+          }
+        );
+        await Promise.all([
+          promise_rejects(t, "InvalidStateError", promise2),
+          promise_rejects(t, "InvalidStateError", promise3),
+        ]);
+      }, "Only allow one share call at a time, which is controlled by the [[sharePromise]] internal slot.");
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-simple-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-simple-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-simple-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-simple-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Simple share</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        const url = 'https://www.example.com/some/path?some_query#some_fragment';
-        setupManualShareTest({title: 'the title', text: 'the message', url});
-        callWhenButtonClicked(() => navigator.share(
-              {title: 'the title', text: 'the message', url})).then(
-              result => {
-                // Check that promise resolved with undefined. This is guarded
-                // by an if statement because we do not want it to register as a
-                // test if it passes (since this is a manual test).
-                if (result !== undefined) {
-                  assert_equals(result, undefined);
-                }
-              });
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-simple-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-simple-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-simple-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-simple-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Simple share</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        const url = 'https://www.example.com/some/path?some_query#some_fragment';
+        setupManualShareTest({title: 'the title', text: 'the message', url});
+        callWhenButtonClicked(() => navigator.share(
+              {title: 'the title', text: 'the message', url})).then(
+              result => {
+                // Check that promise resolved with undefined. This is guarded
+                // by an if statement because we do not want it to register as a
+                // test if it passes (since this is a manual test).
+                if (result !== undefined) {
+                  assert_equals(result, undefined);
+                }
+              });
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-unicode-strings-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-unicode-strings-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-unicode-strings-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-unicode-strings-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share with non-ASCII Unicode strings</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        // Title is a string with BMP and non-BMP characters.
-        // Text contains invalid surrogates which should be converted into U+FFFD.
-        // URL contains non-ASCII characters in host and path.
-        const title = 'fáncy 写作 😱';
-        const url = 'https://测试.example.com/📄';
-        // Host is IDNA-encoded. Path is percent-encoded.
-        const url_ascii = 'https://xn--0zwm56d.example.com/%F0%9F%93%84';
-        setupManualShareTest({title, text: '\ufffdx', url: url_ascii});
-        callWhenButtonClicked(() => navigator.share({title, text: '\ud9a3x', url}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-unicode-strings-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-unicode-strings-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-unicode-strings-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-unicode-strings-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share with non-ASCII Unicode strings</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        // Title is a string with BMP and non-BMP characters.
+        // Text contains invalid surrogates which should be converted into U+FFFD.
+        // URL contains non-ASCII characters in host and path.
+        const title = 'fáncy 写作 😱';
+        const url = 'https://测试.example.com/📄';
+        // Host is IDNA-encoded. Path is percent-encoded.
+        const url_ascii = 'https://xn--0zwm56d.example.com/%F0%9F%93%84';
+        setupManualShareTest({title, text: '\ufffdx', url: url_ascii});
+        callWhenButtonClicked(() => navigator.share({title, text: '\ud9a3x', url}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-unicode-strings-nonutf8-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-unicode-strings-nonutf8-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-unicode-strings-nonutf8-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-unicode-strings-nonutf8-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="windows-1252">
-    <title>WebShare Test: Share with non-ASCII Unicode strings in a Latin-1-encoded page</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        assert_equals(document.characterSet, 'windows-1252');
-
-        // Exact same test as in share-unicode-strings-manual.html, with same
-        // expectations. This tests that the page's encoding (ISO-8859-1) is
-        // ignored and Unicode characters are always percent-encoded in UTF-8.
-        const title = 'f\xe1ncy \u5199\u4f5c \ud83d\ude31';
-        const url = 'https://\u6d4b\u8bd5.example.com/\ud83d\udcc4';
-        // Host is IDNA-encoded. Path is percent-encoded with UTF-8.
-        const url_ascii = 'https://xn--0zwm56d.example.com/%F0%9F%93%84';
-        setupManualShareTest({title, text: '\ufffdx', url: url_ascii});
-        callWhenButtonClicked(() => navigator.share({title, text: '\ud9a3x', url}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-unicode-strings-nonutf8-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-unicode-strings-nonutf8-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-unicode-strings-nonutf8-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-unicode-strings-nonutf8-manual.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="windows-1252">
+    <title>WebShare Test: Share with non-ASCII Unicode strings in a Latin-1-encoded page</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        assert_equals(document.characterSet, 'windows-1252');
+
+        // Exact same test as in share-unicode-strings-manual.html, with same
+        // expectations. This tests that the page's encoding (ISO-8859-1) is
+        // ignored and Unicode characters are always percent-encoded in UTF-8.
+        const title = 'f\xe1ncy \u5199\u4f5c \ud83d\ude31';
+        const url = 'https://\u6d4b\u8bd5.example.com/\ud83d\udcc4';
+        // Host is IDNA-encoded. Path is percent-encoded with UTF-8.
+        const url_ascii = 'https://xn--0zwm56d.example.com/%F0%9F%93%84';
+        setupManualShareTest({title, text: '\ufffdx', url: url_ascii});
+        callWhenButtonClicked(() => navigator.share({title, text: '\ud9a3x', url}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-data-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-data-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-data-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-data-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share with data URL</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        const url = 'data:foo';
-        setupManualShareTest({title: '', text: '', url: getAbsoluteUrl(url)});
-        callWhenButtonClicked(() => navigator.share({url}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-data-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-data-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-data-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-data-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share with data URL</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        const url = 'data:foo';
+        setupManualShareTest({title: '', text: '', url: getAbsoluteUrl(url)});
+        callWhenButtonClicked(() => navigator.share({url}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-empty-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-empty-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-empty-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-empty-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share with empty URL</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        setupManualShareTest({title: '', text: '', url: document.baseURI});
-        callWhenButtonClicked(() => navigator.share({url: ''}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-empty-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-empty-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-empty-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-empty-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share with empty URL</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        setupManualShareTest({title: '', text: '', url: document.baseURI});
+        callWhenButtonClicked(() => navigator.share({url: ''}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-encoding-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-encoding-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-encoding-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-encoding-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share URL with illegal characters (test percent encoding)</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        const url = 'http://example.com/foo\\ab%63\r\n\t "<>`{}';
-        // Expect '\' to normalize to '/', "%63" to normalize to 'c', '\r\n\t'
-        // to be removed, and all the other illegal characters to be percent-escaped.
-        const url_encoded = 'http://example.com/foo/abc%20%22%3C%3E%60%7B%7D';
-        setupManualShareTest({title: '', text: '', url: url_encoded});
-        callWhenButtonClicked(() => navigator.share({url}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-encoding-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-encoding-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-encoding-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-encoding-manual.https.html	2019-09-15 11:33:27.000000000 +0000
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share URL with illegal characters (test percent encoding)</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        const url = 'http://example.com/foo\\ab%63\r\n\t "<>`{}';
+        // Expect '\' to normalize to '/', "%63" to normalize to 'c', '\r\n\t'
+        // to be removed, and all the other illegal characters to be percent-escaped.
+        const url_encoded = 'http://example.com/foo/abc%20%22%3C%3E%60%7B%7D';
+        setupManualShareTest({title: '', text: '', url: url_encoded});
+        callWhenButtonClicked(() => navigator.share({url}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-noscheme-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-noscheme-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-noscheme-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-noscheme-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share with URL without a scheme</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        const url = '//www.example.com/some/path?some_query#some_fragment';
-        setupManualShareTest({title: '', text: '', url: getAbsoluteUrl(url)});
-        callWhenButtonClicked(() => navigator.share({url}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-noscheme-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-noscheme-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-noscheme-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-noscheme-manual.https.html	2019-09-15 11:33:30.000000000 +0000
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share with URL without a scheme</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        const url = '//www.example.com/some/path?some_query#some_fragment';
+        setupManualShareTest({title: '', text: '', url: getAbsoluteUrl(url)});
+        callWhenButtonClicked(() => navigator.share({url}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-pathonly-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-pathonly-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-pathonly-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-pathonly-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share with absolute path-only URL</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        const url = '/some/path?some_query#some_fragment';
-        setupManualShareTest({title: '', text: '', url: getAbsoluteUrl(url)});
-        callWhenButtonClicked(() => navigator.share({url}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-pathonly-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-pathonly-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-pathonly-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-pathonly-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share with absolute path-only URL</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        const url = '/some/path?some_query#some_fragment';
+        setupManualShareTest({title: '', text: '', url: getAbsoluteUrl(url)});
+        callWhenButtonClicked(() => navigator.share({url}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-relative-manual.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-relative-manual.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-relative-manual.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-relative-manual.html	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>WebShare Test: Share with relative URL</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="resources/manual-helper.js"></script>
-    <base href="https://www.example.com/some/path.html">
-  </head>
-  <body>
-    <script>
-        setup({explicit_timeout: true});
-
-        const url = 'foo';
-        setupManualShareTest({title: '', text: '', url: getAbsoluteUrl(url)});
-        callWhenButtonClicked(() => navigator.share({url}));
-    </script>
-  </body>
-</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-relative-manual.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-relative-manual.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-url-relative-manual.https.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-url-relative-manual.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>WebShare Test: Share with relative URL</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="resources/manual-helper.js"></script>
+    <base href="https://www.example.com/some/path.html">
+  </head>
+  <body>
+    <script>
+        setup({explicit_timeout: true});
+
+        const url = 'foo';
+        setupManualShareTest({title: '', text: '', url: getAbsoluteUrl(url)});
+        callWhenButtonClicked(() => navigator.share({url}));
+    </script>
+  </body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-without-user-gesture.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-without-user-gesture.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/web-share/share-without-user-gesture.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/web-share/share-without-user-gesture.https.html	2019-09-15 11:33:29.000000000 +0000
@@ -12,7 +12,7 @@
           return promise_rejects(
               t, 'NotAllowedError',
               navigator.share({title: 'the title', text: 'the message',
-                               url: 'data:the url'}));
+                               url: 'https://example.com'}));
         }, 'share without a user gesture');
     </script>
   </body>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html	2019-09-15 11:33:30.000000000 +0000
@@ -2,6 +2,7 @@
 <html class="reftest-wait">
 <title>WebVTT rendering, 2 tracks enabled at the same time</title>
 <link rel="match" href="2_tracks-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 html { overflow:hidden }
 body { margin:0 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html	2019-09-15 11:33:28.000000000 +0000
@@ -2,6 +2,7 @@
 <html class="reftest-wait">
 <title>Reference for WebVTT rendering, 2 tracks enabled at the same time</title>
 <script src="/common/reftest-wait.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 html { overflow:hidden }
 body { margin:0 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html	2019-09-15 11:33:28.000000000 +0000
@@ -2,6 +2,7 @@
 <html class="reftest-wait">
 <title>WebVTT rendering, 3 tracks enabled at the same time</title>
 <link rel="match" href="3_tracks-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 html { overflow:hidden }
 body { margin:0 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html	2019-09-15 11:33:28.000000000 +0000
@@ -2,6 +2,7 @@
 <html class="reftest-wait">
 <title>Reference for WebVTT rendering, 3 tracks enabled at the same time</title>
 <script src="/common/reftest-wait.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
 <style>
 html { overflow:hidden }
 body { margin:0 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webxr/xrReferenceSpace_originOffsetBounded.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webxr/xrReferenceSpace_originOffsetBounded.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webxr/xrReferenceSpace_originOffsetBounded.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -87,9 +87,9 @@
             let grip_matrix = grip_pose.transform.matrix;
             let ray_matrix = input_pose.transform.matrix;
 
-            assert_matrix_approx_equals(expected_view_matrix, view_matrix);
-            assert_matrix_approx_equals(expected_grip_matrix, grip_matrix);
-            assert_matrix_approx_equals(expected_ray_matrix, ray_matrix);
+            assert_matrix_approx_equals(view_matrix, expected_view_matrix);
+            assert_matrix_approx_equals(grip_matrix, expected_grip_matrix);
+            assert_matrix_approx_equals(ray_matrix, expected_ray_matrix);
 
             assert_equals(reference_space.boundsGeometry.length, expected_bounds_geometry.length);
             for (var i = 0; i < reference_space.boundsGeometry.length; ++i) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webxr/xrReferenceSpace_originOffset.https.html firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webxr/xrReferenceSpace_originOffset.https.html
--- firefox-trunk-71.0~a1~hg20190913r492975/testing/web-platform/tests/webxr/xrReferenceSpace_originOffset.https.html	2019-09-13 05:13:33.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/testing/web-platform/tests/webxr/xrReferenceSpace_originOffset.https.html	2019-09-15 11:33:28.000000000 +0000
@@ -11,7 +11,7 @@
 
 const VIEW_OFFSET_WITH_ROTATION = {
   position: [4, 3, 2],
-  orientation: [0, -0.71, 0, 0.71 ]
+  orientation: [0, -0.7071, 0, 0.7071 ]
 };
 
 const VIEWS_WITH_OFFSET = [{
@@ -55,15 +55,15 @@
 
     const RADIANS_90D = Math.PI / 2;
 
-    const EXPECTED_VIEW_MATRIX_1 = [0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, -5, -4, -3, 1];
+    const EXPECTED_VIEW_MATRIX_1 = [1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, -3, -4, 5, 1];
     const EXPECTED_GRIP_MATRIX_1 = [0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 2, 3, 1];
     const EXPECTED_RAY_MATRIX_1 = [0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 2, 2, 1, 1];
 
-    const EXPECTED_VIEW_MATRIX_2 = [0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, 0, -8, 1, 7, 1];
+    const EXPECTED_VIEW_MATRIX_2 = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 7, 1, 8, 1];
     const EXPECTED_GRIP_MATRIX_2 = [0, -1, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, -9, -2, -5, 1];
     const EXPECTED_RAY_MATRIX_2 = [0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 0, -8, -4, -5, 1];
 
-    const EXPECTED_VIEW_MATRIX_3 = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -8, 3, 12, 1];
+    const EXPECTED_VIEW_MATRIX_3 = [0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 12, 3, 8, 1];
     const EXPECTED_GRIP_MATRIX_3 = [0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 5, -4, -14, 1];
     const EXPECTED_RAY_MATRIX_3 = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 5, -6, -13, 1];
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/Cargo.lock firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/Cargo.lock
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/Cargo.lock	2019-09-13 05:14:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/Cargo.lock	2019-09-15 11:34:33.000000000 +0000
@@ -119,7 +119,7 @@
 
 [[package]]
 name = "rand"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "getrandom 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -222,7 +222,7 @@
 dependencies = [
  "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.62 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
  "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -298,7 +298,7 @@
 "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b"
 "checksum proc-macro2 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "e98a83a9f9b331f54b924e68a66acb1bb35cb01fb0a23645139967abefb697e8"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
-"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c"
+"checksum rand 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "59cea0d944b32347a1863e95942fd6ebdb486afb4f038119494f2860380c1d51"
 "checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853"
 "checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
 "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/benches/weighted.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/benches/weighted.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/benches/weighted.rs	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/benches/weighted.rs	2019-09-15 11:34:34.000000000 +0000
@@ -0,0 +1,36 @@
+// Copyright 2019 Developers of the Rand project.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(test)]
+
+extern crate test;
+
+use test::Bencher;
+use rand::Rng;
+use rand::distributions::WeightedIndex;
+
+#[bench]
+fn weighted_index_creation(b: &mut Bencher) {
+    let mut rng = rand::thread_rng();
+    let weights = [1u32, 2, 4, 0, 5, 1, 7, 1, 2, 3, 4, 5, 6, 7];
+    b.iter(|| {
+        let distr = WeightedIndex::new(weights.to_vec()).unwrap();
+        rng.sample(distr)
+    })
+}
+
+#[bench]
+fn weighted_index_modification(b: &mut Bencher) {
+    let mut rng = rand::thread_rng();
+    let weights = [1u32, 2, 3, 0, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7];
+    let mut distr = WeightedIndex::new(weights.to_vec()).unwrap();
+    b.iter(|| {
+        distr.update_weights(&[(2, &4), (5, &1)]).unwrap();
+        rng.sample(&distr)
+    })
+}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/.cargo-checksum.json firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/.cargo-checksum.json
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/.cargo-checksum.json	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/.cargo-checksum.json	2019-09-15 11:34:34.000000000 +0000
@@ -1 +1 @@
-{"files":{"CHANGELOG.md":"267edffb6a11c05bd68359e25787a41dd5c714eeac81f8e9c26e9b26ec9123b3","COPYRIGHT":"90eb64f0279b0d9432accfa6023ff803bc4965212383697eee27a0f426d5f8d5","Cargo.toml":"59999f74d99360d2170f23ecfa87cdd442e450242dcaaf3e4b37de5e78fb6297","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"e1e708de430a890a48fdd342cbee98b7911870522a100ccaf435c96ac306e589","benches/generators.rs":"f431e5c618b5d7ceedb4720d0b0f0d20b73a4f895129e01bc24a47461b158116","benches/misc.rs":"ef3180a16c469cfcda2cf5146d8ea0e77552316f9e0ad0de4690cf492d725dfe","benches/seq.rs":"dea8cfb68e944acdd488fe464fbb68298f07bb972f55d0a963c775b5b253eb57","examples/monte-carlo.rs":"5c01a47885a31445e78fab076f8328a7732bca41d84e0d4ba5670b80ca7a883f","examples/monty-hall.rs":"437d5150e8375f64e24d6bac63b5385114196698d5457c8a1b4f50defa427a37","rustfmt.toml":"f0f95df871dbc3b5e6619a6a652746ff50d6185e4d5198fc9b70de703047c660","src/distributions/bernoulli.rs":"1f009bdf335ab097e1ed09d2c3ce9db15d2ed4470935142e84952d9c8dad7dd9","src/distributions/binomial.rs":"b001fb614138593cd9e2c53d722adb389aa729ef3406e08cd18ba211e06286b7","src/distributions/cauchy.rs":"307c06a1555d72b408563f8ed57745741d05466064e8dd7d5ca25a57c2767177","src/distributions/dirichlet.rs":"5795c0529ed62856fcc30acfac9e5770c5434c0812bd1229717c2cb6169042cb","src/distributions/exponential.rs":"1a56996d982524373d88ed008a48e7fc9ada1d62b17bed706637739962d9a42f","src/distributions/float.rs":"2ac5ccf15414225beb29f61b1b84cd57eb8ba9fb545d5539c3281f6f5cbbb8f1","src/distributions/gamma.rs":"7853b91e322ad6dda2ecc944e5291e46524c32955d8e93d15eb22e68ecbadf55","src/distributions/integer.rs":"3a69f3055d8980a23b40c465fa268797103cc101ee751924cdf720d89f53ab5f","src/distributions/mod.rs":"7a338580eb29180c75017035bb134e529248d11eb0da4a342849a37ab20ed274","src/distributions/normal.rs":"afd5dfafc1ab4c6905ff823e5ece0a808731108c67bd9f7435454e1962018bba","src/distributions/other.rs":"3d4279aa021cce196166fb31c12a0c7c0e957b3db5b24a9346e141cc196e8397","src/distributions/pareto.rs":"3d8f9467daa0c6a831da90e14cf2600352da32a37c5483858ae718f4c888c936","src/distributions/poisson.rs":"b6d848616f07cc6387a69fe1e8fcb7718fc25e7c7c5db27fb7356e29446346f1","src/distributions/triangular.rs":"0b1584f874eeef21b55189c072e3ba6003014a9507f461a0ae0a3e9a95a6a536","src/distributions/uniform.rs":"3f5548c0c80b5a29a73fe07d1195429ad335f9750616c0070df7a12c433d8a4d","src/distributions/unit_circle.rs":"4e90c0dbb31d68aa1b9f21f3877875489137092d7cfea2e477417cb4627e8081","src/distributions/unit_sphere.rs":"0ca0250c23765368b0e2ef71b546bcb4955d149c10b2441b9fc5a05df23129fb","src/distributions/utils.rs":"9707792bac7d68478bf602af82cdaae876171d22d452a06e2135eec8cf4ec753","src/distributions/weibull.rs":"403a5c9e5b82ac252e27fd5d295769c557bb41d817cc98a3cbd6910d6221d2de","src/distributions/weighted/alias_method.rs":"4940d35b2a125de60dc685b4bc8b61df87308334fad738c07a8455c70502a247","src/distributions/weighted/mod.rs":"e03bf27b7a870d403b34e06a97b34724bef5696845e78c9c85a158a93a1cd85d","src/distributions/ziggurat_tables.rs":"6368acec20801c703ae76dd1e08983793732c5ac221c491f85d719ef75448b6d","src/lib.rs":"37898a8ab404dfb96377826066c0fc1c36958234b258c95ce7b12619bd389ace","src/prelude.rs":"331b6249754e89cf0c493e443b41455ffce4146c24de2bffdd596f355d86e5f8","src/rngs/adapter/mod.rs":"a625303a793b3f7ee2e25d210204493d1774e0cee8b39dc2cab0035e80c0ce24","src/rngs/adapter/read.rs":"243a388e91c9bb8a6172027969c4690b6b130bdf13bcb2759456b44b9a8fcef9","src/rngs/adapter/reseeding.rs":"62cc33d0a5dcef1b76cdc06b181104615c266638aeeca09ebfd4ea2416149283","src/rngs/entropy.rs":"ac350a6862af7f6bfde9e730b79da3955c94da2906e723b158cd5a33b90bafa6","src/rngs/mock.rs":"0b1210f9bec383d4afe6c3a0f6fd32437fd54d0f4b1c5865509a35ff79d045a8","src/rngs/mod.rs":"7dcfd83851c5a8e8ed999adedecf1be6b9005c465cdd5334020ab1a2fe55d5ff","src/rngs/os.rs":"d251a2d2c6a5b1bb348d776e466469b33152b830090fca5c72b71be694304abb","src/rngs/small.rs":"8783d45d1ceefea7c4dff7e3787bad621f64f8b1891d372333221d75c7be10b5","src/rngs/std.rs":"5212698b548b0581d4058df6eae1ea532aea01246f342b197096f429ab3b301b","src/rngs/thread.rs":"fe575428f4a1c9eeddefacf305b85ce645fa0b5d8caa4d1e41f9bbb63cc3ac0c","src/seq/index.rs":"29ae0815b2e5738c58228fcb7a9053987487310a6ded396a34bff330099af8b4","src/seq/mod.rs":"a5e41438cd83f2c7e086c2708b5f59a248c0098bad0ad9c3432667e75be4e8c9"},"package":"d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c"}
\ No newline at end of file
+{"files":{"CHANGELOG.md":"e951a089572a50cd98f1d470c88af960cb97c6afac358753c4ae2e7c363c45dd","COPYRIGHT":"90eb64f0279b0d9432accfa6023ff803bc4965212383697eee27a0f426d5f8d5","Cargo.toml":"5b8f1b1ea20ef95778c44c5ea92225de05ca25fe26a08283e924e492b776c5ae","LICENSE-APACHE":"aaff376532ea30a0cd5330b9502ad4a4c8bf769c539c87ffe78819d188a18ebf","LICENSE-MIT":"209fbbe0ad52d9235e37badf9cadfe4dbdc87203179c0899e738b39ade42177b","README.md":"0f77ce628765a4883589eab074ff877f9f7731cbeac91f961139d70692fb503d","benches/generators.rs":"f431e5c618b5d7ceedb4720d0b0f0d20b73a4f895129e01bc24a47461b158116","benches/misc.rs":"ef3180a16c469cfcda2cf5146d8ea0e77552316f9e0ad0de4690cf492d725dfe","benches/seq.rs":"dea8cfb68e944acdd488fe464fbb68298f07bb972f55d0a963c775b5b253eb57","benches/weighted.rs":"67a40f456c7b024000c2db24f64af7ae24a147d3c2c55af1349970de3faca3fd","examples/monte-carlo.rs":"5c01a47885a31445e78fab076f8328a7732bca41d84e0d4ba5670b80ca7a883f","examples/monty-hall.rs":"437d5150e8375f64e24d6bac63b5385114196698d5457c8a1b4f50defa427a37","rustfmt.toml":"f0f95df871dbc3b5e6619a6a652746ff50d6185e4d5198fc9b70de703047c660","src/distributions/bernoulli.rs":"4cf8ae8b0d116f73dc68d269d84d16ea34db79eb982592c55735e83468ab5a3e","src/distributions/binomial.rs":"0fc44a6ceb3440e706c52d38631f741c00b1b03165cf1f1acd4adfb89a6c998a","src/distributions/cauchy.rs":"c58768bf151786ff08148fe06024f9db05e450a4e24ffb50a94d8399f67b817b","src/distributions/dirichlet.rs":"bc3fa16b5d5c8ae472924f142efe1de06980ba31f73378750958348eba546390","src/distributions/exponential.rs":"02afd305a813bd6dd7d6f9148fd3284bb85e8aa07a9ba2b18e16ad66c2ca0cde","src/distributions/float.rs":"df743e15c2a402dd3d669257117b96bc9a9061f282cfe9b53083187bedb37bda","src/distributions/gamma.rs":"7853b91e322ad6dda2ecc944e5291e46524c32955d8e93d15eb22e68ecbadf55","src/distributions/integer.rs":"95462e9f744f86c46de69b639f8b34e73062c0efa50afa2bf9790de35b21757c","src/distributions/mod.rs":"6a739ac71b2833f69357245872076f1da3417b131aa00db249df483c5f5db96c","src/distributions/normal.rs":"afd5dfafc1ab4c6905ff823e5ece0a808731108c67bd9f7435454e1962018bba","src/distributions/other.rs":"7bca6fb6b1631dc76545ae3c672416842750709deaceeeb75e5692b4a62915d5","src/distributions/pareto.rs":"3d8f9467daa0c6a831da90e14cf2600352da32a37c5483858ae718f4c888c936","src/distributions/poisson.rs":"b6d848616f07cc6387a69fe1e8fcb7718fc25e7c7c5db27fb7356e29446346f1","src/distributions/triangular.rs":"0b1584f874eeef21b55189c072e3ba6003014a9507f461a0ae0a3e9a95a6a536","src/distributions/uniform.rs":"31e9e9ac88c33a275b8442d6750afe24574c1a266d770ab5b4810d93a609fedf","src/distributions/unit_circle.rs":"34f58c46f57c7995cd6b8fe32906cd529bfe7bc8e53963177b7a478745af0bc1","src/distributions/unit_sphere.rs":"4db4f3af623cf4e40e00bf00b4c3f549a5ff8bf0c31468a4c77838f9dee5587a","src/distributions/utils.rs":"1c91cac422c52050091ee73873e79fbcaa7a4d6c99cf7f198b8e7f9c1936c05a","src/distributions/weibull.rs":"403a5c9e5b82ac252e27fd5d295769c557bb41d817cc98a3cbd6910d6221d2de","src/distributions/weighted/alias_method.rs":"4940d35b2a125de60dc685b4bc8b61df87308334fad738c07a8455c70502a247","src/distributions/weighted/mod.rs":"412c9942165151e7cc090d2b8735bf264b02a7bb8b948fbd51fe6d0c63e8a521","src/distributions/ziggurat_tables.rs":"6368acec20801c703ae76dd1e08983793732c5ac221c491f85d719ef75448b6d","src/lib.rs":"c5fb3ed272ed93bd8d799c50e46f872158d1a05ded1c89406d51052cd9dca37c","src/prelude.rs":"331b6249754e89cf0c493e443b41455ffce4146c24de2bffdd596f355d86e5f8","src/rngs/adapter/mod.rs":"a625303a793b3f7ee2e25d210204493d1774e0cee8b39dc2cab0035e80c0ce24","src/rngs/adapter/read.rs":"35a1f2bbd29485d4130b1e4b75f9fe0e9a0ef7e779e4c77b0dbfd23900bfdb42","src/rngs/adapter/reseeding.rs":"c62b32e7d925cdfb5972672a493d6edd8f304403fb6f6d5c0fb063d77467917b","src/rngs/entropy.rs":"3bf02b8b1d1531608e8483c8723a96fd30204f84318880851d2c431eabc72439","src/rngs/mock.rs":"18fad8c5c0c4625b2941919b5be89ef77f2a7841261005320b8689c9b1e5a8e3","src/rngs/mod.rs":"0678444670a1d88fbee6b7fcc17f4a84a584998b3e6367c86379d212180b2383","src/rngs/small.rs":"7435781d3229d1e17dfc4e2db991067395250dca7e6af724db09f93c6f96e277","src/rngs/std.rs":"2765d7a1cf85556af12cf46e24986711ba52592d4b8b139f7164368f4886a53b","src/rngs/thread.rs":"fe575428f4a1c9eeddefacf305b85ce645fa0b5d8caa4d1e41f9bbb63cc3ac0c","src/seq/index.rs":"a13461729540080c19da0f8a4b36d844f4519524858adb05adfffe386d330064","src/seq/mod.rs":"caa14c4ca934ffbf3bdc1bc0862f96852a5af39ebd0bc1784aa52981d44e5404"},"package":"59cea0d944b32347a1863e95942fd6ebdb486afb4f038119494f2860380c1d51"}
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/Cargo.toml firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/Cargo.toml
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/Cargo.toml	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/Cargo.toml	2019-09-15 11:34:34.000000000 +0000
@@ -13,7 +13,7 @@
 [package]
 edition = "2018"
 name = "rand"
-version = "0.7.0"
+version = "0.7.1"
 authors = ["The Rand Project Developers", "The Rust Project Developers"]
 exclude = ["/utils/*", "/.travis.yml", "/appveyor.yml", ".gitignore"]
 autobenches = true
@@ -23,7 +23,7 @@
 readme = "README.md"
 keywords = ["random", "rng"]
 categories = ["algorithms", "no-std"]
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-random/rand"
 [package.metadata.docs.rs]
 all-features = true
@@ -33,7 +33,7 @@
 package = "getrandom"
 
 [dependencies.log]
-version = "0.4"
+version = "0.4.4"
 optional = true
 
 [dependencies.packed_simd]
@@ -60,7 +60,7 @@
 version = "0.2"
 
 [dev-dependencies.rand_xoshiro]
-version = "0.3"
+version = "0.4"
 
 [features]
 alloc = ["rand_core/alloc"]
@@ -70,11 +70,12 @@
 serde1 = []
 simd_support = ["packed_simd"]
 small_rng = ["rand_pcg"]
-std = ["rand_core/std", "alloc", "getrandom"]
+std = ["rand_core/std", "rand_chacha/std", "alloc", "getrandom"]
 stdweb = ["getrandom_package/stdweb"]
 wasm-bindgen = ["getrandom_package/wasm-bindgen"]
 [target."cfg(not(target_os = \"emscripten\"))".dependencies.rand_chacha]
-version = "0.2"
+version = "0.2.1"
+default-features = false
 [target."cfg(target_os = \"emscripten\")".dependencies.rand_hc]
 version = "0.2"
 [target."cfg(unix)".dependencies.libc]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/CHANGELOG.md firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/CHANGELOG.md
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/CHANGELOG.md	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/CHANGELOG.md	2019-09-15 11:34:34.000000000 +0000
@@ -8,6 +8,15 @@
 
 You may also find the [Upgrade Guide](https://rust-random.github.io/book/update.html) useful.
 
+## [0.7.1] - 2019-09-13
+### Fixes
+- Fix `no_std` behaviour, appropriately enable c2-chacha's `std` feature (#844)
+- `alloc` feature in `no_std` is available since Rust 1.36 (#856)
+- Fix or squelch issues from Clippy lints (#840)
+
+### Additions
+- Add a `no_std` target to CI to continously evaluate `no_std` status (#844)
+- `WeightedIndex`: allow adjusting a sub-set of weights (#866)
 
 ## [0.7.0] - 2019-06-28
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/README.md firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/README.md
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/README.md	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/README.md	2019-09-15 11:34:34.000000000 +0000
@@ -79,18 +79,12 @@
 supported Rust release. The current policy is that this can be updated in any
 Rand release if required, but the change must be noted in the changelog.
 
-To avoid bumping the required version unnecessarily, we use a `build.rs` script
-to auto-detect the compiler version and enable certain features or change code
-paths automatically. Since this makes it easy to unintentionally make use of
-features requiring a more recent Rust version, we recommend testing with a
-pinned version of Rustc if you require compatibility with a specific version.
-
 ## Crate Features
 
 Rand is built with these features enabled by default:
 
 -   `std` enables functionality dependent on the `std` lib
--   `alloc` (implied by `std`) enables functionality requiring an allocator
+-   `alloc` (implied by `std`) enables functionality requiring an allocator (when using this feature in `no_std`, Rand requires Rustc version 1.36 or greater)
 -   `getrandom` (implied by `std`) is an optional dependency providing the code
     behind `rngs::OsRng`
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/bernoulli.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/bernoulli.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/bernoulli.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/bernoulli.rs	2019-09-15 11:34:34.000000000 +0000
@@ -96,13 +96,13 @@
     /// return `true`. If `numerator == 0` it will always return `false`.
     #[inline]
     pub fn from_ratio(numerator: u32, denominator: u32) -> Result<Bernoulli, BernoulliError> {
-        if !(numerator <= denominator) {
+        if numerator > denominator {
             return Err(BernoulliError::InvalidProbability);
         }
         if numerator == denominator {
             return Ok(Bernoulli { p_int: ALWAYS_TRUE })
         }
-        let p_int = ((numerator as f64 / denominator as f64) * SCALE) as u64;
+        let p_int = ((f64::from(numerator) / f64::from(denominator)) * SCALE) as u64;
         Ok(Bernoulli { p_int })
     }
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/binomial.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/binomial.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/binomial.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/binomial.rs	2019-09-15 11:34:34.000000000 +0000
@@ -9,6 +9,7 @@
 
 //! The binomial distribution.
 #![allow(deprecated)]
+#![allow(clippy::all)]
 
 use crate::Rng;
 use crate::distributions::{Distribution, Uniform};
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/cauchy.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/cauchy.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/cauchy.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/cauchy.rs	2019-09-15 11:34:34.000000000 +0000
@@ -9,6 +9,7 @@
 
 //! The Cauchy distribution.
 #![allow(deprecated)]
+#![allow(clippy::all)]
 
 use crate::Rng;
 use crate::distributions::Distribution;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/dirichlet.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/dirichlet.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/dirichlet.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/dirichlet.rs	2019-09-15 11:34:34.000000000 +0000
@@ -9,6 +9,7 @@
 
 //! The dirichlet distribution.
 #![allow(deprecated)]
+#![allow(clippy::all)]
 
 use crate::Rng;
 use crate::distributions::Distribution;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/exponential.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/exponential.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/exponential.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/exponential.rs	2019-09-15 11:34:34.000000000 +0000
@@ -57,7 +57,7 @@
 /// This distribution has density function: `f(x) = lambda * exp(-lambda * x)`
 /// for `x > 0`.
 /// 
-/// Note that [`Exp1`][crate::distributions::Exp1] is an optimised implementation for `lambda = 1`.
+/// Note that [`Exp1`](crate::distributions::Exp1) is an optimised implementation for `lambda = 1`.
 #[deprecated(since="0.7.0", note="moved to rand_distr crate")]
 #[derive(Clone, Copy, Debug)]
 pub struct Exp {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/float.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/float.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/float.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/float.rs	2019-09-15 11:34:34.000000000 +0000
@@ -95,9 +95,7 @@
                 // The exponent is encoded using an offset-binary representation
                 let exponent_bits: $u_scalar =
                     (($exponent_bias + exponent) as $u_scalar) << $fraction_bits;
-                // TODO: use from_bits when min compiler > 1.25 (see #545)
-                // $ty::from_bits(self | exponent_bits)
-                unsafe{ mem::transmute(self | exponent_bits) }
+                $ty::from_bits(self | exponent_bits)
             }
         }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/integer.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/integer.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/integer.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/integer.rs	2019-09-15 11:34:34.000000000 +0000
@@ -52,8 +52,8 @@
     #[inline]
     fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> u128 {
         // Use LE; we explicitly generate one value before the next.
-        let x = rng.next_u64() as u128;
-        let y = rng.next_u64() as u128;
+        let x = u128::from(rng.next_u64());
+        let y = u128::from(rng.next_u64());
         (y << 64) | x
     }
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/mod.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/mod.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/mod.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/mod.rs	2019-09-15 11:34:34.000000000 +0000
@@ -213,7 +213,7 @@
     {
         DistIter {
             distr: self,
-            rng: rng,
+            rng,
             phantom: ::core::marker::PhantomData,
         }
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/other.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/other.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/other.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/other.rs	2019-09-15 11:34:34.000000000 +0000
@@ -11,7 +11,7 @@
 use core::char;
 use core::num::Wrapping;
 
-use crate::{Rng};
+use crate::Rng;
 use crate::distributions::{Distribution, Standard, Uniform};
 
 // ----- Sampling distributions -----
@@ -116,6 +116,7 @@
 }
 
 impl Distribution<()> for Standard {
+    #[allow(clippy::unused_unit)]
     #[inline]
     fn sample<R: Rng + ?Sized>(&self, _: &mut R) -> () { () }
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/uniform.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/uniform.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/uniform.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/uniform.rs	2019-09-15 11:34:34.000000000 +0000
@@ -380,7 +380,7 @@
                 let range = high.wrapping_sub(low).wrapping_add(1) as $unsigned;
                 let ints_to_reject =
                     if range > 0 {
-                        let range = range as $u_large;
+                        let range = $u_large::from(range);
                         (unsigned_max - range + 1) % range
                     } else {
                         0
@@ -865,8 +865,8 @@
         let mut high_n = high.subsec_nanos();
 
         if high_n < low_n {
-            high_s = high_s - 1;
-            high_n = high_n + 1_000_000_000;
+            high_s -= 1;
+            high_n += 1_000_000_000;
         }
 
         let mode = if low_s == high_s {
@@ -877,10 +877,10 @@
         } else {
             let max = high_s
                 .checked_mul(1_000_000_000)
-                .and_then(|n| n.checked_add(high_n as u64));
+                .and_then(|n| n.checked_add(u64::from(high_n)));
 
             if let Some(higher_bound) = max {
-                let lower_bound = low_s * 1_000_000_000 + low_n as u64;
+                let lower_bound = low_s * 1_000_000_000 + u64::from(low_n);
                 UniformDurationMode::Medium {
                     nanos: Uniform::new_inclusive(lower_bound, higher_bound),
                 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/unit_circle.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/unit_circle.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/unit_circle.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/unit_circle.rs	2019-09-15 11:34:34.000000000 +0000
@@ -7,6 +7,7 @@
 // except according to those terms.
 
 #![allow(deprecated)]
+#![allow(clippy::all)]
 
 use crate::Rng;
 use crate::distributions::{Distribution, Uniform};
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/unit_sphere.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/unit_sphere.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/unit_sphere.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/unit_sphere.rs	2019-09-15 11:34:34.000000000 +0000
@@ -7,6 +7,7 @@
 // except according to those terms.
 
 #![allow(deprecated)]
+#![allow(clippy::all)]
 
 use crate::Rng;
 use crate::distributions::{Distribution, Uniform};
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/utils.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/utils.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/utils.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/utils.rs	2019-09-15 11:34:34.000000000 +0000
@@ -249,13 +249,9 @@
 /// Implement functions available in std builds but missing from core primitives
 #[cfg(not(std))]
 pub(crate) trait Float : Sized {
-    type Bits;
-
     fn is_nan(self) -> bool;
     fn is_infinite(self) -> bool;
     fn is_finite(self) -> bool;
-    fn to_bits(self) -> Self::Bits;
-    fn from_bits(v: Self::Bits) -> Self;
 }
 
 /// Implement functions on f32/f64 to give them APIs similar to SIMD types
@@ -289,8 +285,6 @@
     ($ty:ident, $uty:ident) => {
         #[cfg(not(std))]
         impl Float for $ty {
-            type Bits = $uty;
-
             #[inline]
             fn is_nan(self) -> bool {
                 self != self
@@ -305,17 +299,6 @@
             fn is_finite(self) -> bool {
                 !(self.is_nan() || self.is_infinite())
             }
-
-            #[inline]
-            fn to_bits(self) -> Self::Bits {
-                unsafe { ::core::mem::transmute(self) }
-            }
-
-            #[inline]
-            fn from_bits(v: Self::Bits) -> Self {
-                // It turns out the safety issues with sNaN were overblown! Hooray!
-                unsafe { ::core::mem::transmute(v) }
-            }
         }
 
         impl FloatSIMDUtils for $ty {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/weighted/mod.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/weighted/mod.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/distributions/weighted/mod.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/distributions/weighted/mod.rs	2019-09-15 11:34:34.000000000 +0000
@@ -84,6 +84,7 @@
 #[derive(Debug, Clone)]
 pub struct WeightedIndex<X: SampleUniform + PartialOrd> {
     cumulative_weights: Vec<X>,
+    total_weight: X,
     weight_distribution: X::Sampler,
 }
 
@@ -125,9 +126,98 @@
         if total_weight == zero {
             return Err(WeightedError::AllWeightsZero);
         }
-        let distr = X::Sampler::new(zero, total_weight);
+        let distr = X::Sampler::new(zero, total_weight.clone());
 
-        Ok(WeightedIndex { cumulative_weights: weights, weight_distribution: distr })
+        Ok(WeightedIndex { cumulative_weights: weights, total_weight, weight_distribution: distr })
+    }
+
+    /// Update a subset of weights, without changing the number of weights.
+    ///
+    /// `new_weights` must be sorted by the index.
+    ///
+    /// Using this method instead of `new` might be more efficient if only a small number of
+    /// weights is modified. No allocations are performed, unless the weight type `X` uses
+    /// allocation internally.
+    ///
+    /// In case of error, `self` is not modified.
+    pub fn update_weights(&mut self, new_weights: &[(usize, &X)]) -> Result<(), WeightedError>
+        where X: for<'a> ::core::ops::AddAssign<&'a X> +
+                 for<'a> ::core::ops::SubAssign<&'a X> +
+                 Clone +
+                 Default {
+        if new_weights.is_empty() {
+            return Ok(());
+        }
+
+        let zero = <X as Default>::default();
+
+        let mut total_weight = self.total_weight.clone();
+
+        // Check for errors first, so we don't modify `self` in case something
+        // goes wrong.
+        let mut prev_i = None;
+        for &(i, w) in new_weights {
+            if let Some(old_i) = prev_i {
+                if old_i >= i {
+                    return Err(WeightedError::InvalidWeight);
+                }
+            }
+            if *w < zero {
+                return Err(WeightedError::InvalidWeight);
+            }
+            if i >= self.cumulative_weights.len() + 1 {
+                return Err(WeightedError::TooMany);
+            }
+
+            let mut old_w = if i < self.cumulative_weights.len() {
+                self.cumulative_weights[i].clone()
+            } else {
+                self.total_weight.clone()
+            };
+            if i > 0 {
+                old_w -= &self.cumulative_weights[i - 1];
+            }
+
+            total_weight -= &old_w;
+            total_weight += w;
+            prev_i = Some(i);
+        }
+        if total_weight == zero {
+            return Err(WeightedError::AllWeightsZero);
+        }
+
+        // Update the weights. Because we checked all the preconditions in the
+        // previous loop, this should never panic.
+        let mut iter = new_weights.iter();
+
+        let mut prev_weight = zero.clone();
+        let mut next_new_weight = iter.next();
+        let &(first_new_index, _) = next_new_weight.unwrap();
+        let mut cumulative_weight = if first_new_index > 0 {
+            self.cumulative_weights[first_new_index - 1].clone()
+        } else {
+            zero.clone() 
+        };
+        for i in first_new_index..self.cumulative_weights.len() {
+            match next_new_weight {
+                Some(&(j, w)) if i == j => {
+                    cumulative_weight += w;
+                    next_new_weight = iter.next();
+                },
+                _ => {
+                    let mut tmp = self.cumulative_weights[i].clone();
+                    tmp -= &prev_weight;  // We know this is positive.
+                    cumulative_weight += &tmp;
+                }
+            }
+            prev_weight = cumulative_weight.clone();
+            core::mem::swap(&mut prev_weight, &mut self.cumulative_weights[i]);
+        }
+
+        self.total_weight = total_weight;
+        self.weight_distribution = X::Sampler::new(zero, self.total_weight.clone());
+
+        Ok(())
     }
 }
 
@@ -201,6 +291,31 @@
         assert_eq!(WeightedIndex::new(&[-10, 20, 1, 30]).unwrap_err(), WeightedError::InvalidWeight);
         assert_eq!(WeightedIndex::new(&[-10]).unwrap_err(), WeightedError::InvalidWeight);
     }
+
+    #[test]
+    fn test_update_weights() {
+        let data = [
+            (&[10u32, 2, 3, 4][..],
+             &[(1, &100), (2, &4)][..],  // positive change
+             &[10, 100, 4, 4][..]),
+            (&[1u32, 2, 3, 0, 5, 6, 7, 1, 2, 3, 4, 5, 6, 7][..],
+             &[(2, &1), (5, &1), (13, &100)][..],  // negative change and last element
+             &[1u32, 2, 1, 0, 5, 1, 7, 1, 2, 3, 4, 5, 6, 100][..]),
+        ];
+
+        for (weights, update, expected_weights) in data.into_iter() {
+            let total_weight = weights.iter().sum::<u32>();
+            let mut distr = WeightedIndex::new(weights.to_vec()).unwrap();
+            assert_eq!(distr.total_weight, total_weight);
+
+            distr.update_weights(update).unwrap();
+            let expected_total_weight = expected_weights.iter().sum::<u32>();
+            let expected_distr = WeightedIndex::new(expected_weights.to_vec()).unwrap();
+            assert_eq!(distr.total_weight, expected_total_weight);
+            assert_eq!(distr.total_weight, expected_distr.total_weight);
+            assert_eq!(distr.cumulative_weights, expected_distr.cumulative_weights);
+        }
+    }
 }
 
 /// Error type returned from `WeightedIndex::new`.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/lib.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/lib.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/lib.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/lib.rs	2019-09-15 11:34:34.000000000 +0000
@@ -50,15 +50,13 @@
 #![doc(test(attr(allow(unused_variables), deny(warnings))))]
 
 #![cfg_attr(not(feature="std"), no_std)]
-#![cfg_attr(all(feature="alloc", not(feature="std")), feature(alloc))]
 #![cfg_attr(all(feature="simd_support", feature="nightly"), feature(stdsimd))]
 
+#![allow(clippy::excessive_precision, clippy::unreadable_literal, clippy::float_cmp)]
+
 #[cfg(all(feature="alloc", not(feature="std")))]
 extern crate alloc;
 
-#[cfg(feature = "getrandom")]
-use getrandom_package as getrandom;
-
 #[allow(unused)]
 macro_rules! trace { ($($x:tt)*) => (
     #[cfg(feature = "log")] {
@@ -436,7 +434,7 @@
                 }
             }
         }
-        
+
         impl AsByteSliceMut for [Wrapping<$t>] {
             fn as_byte_slice_mut(&mut self) -> &mut [u8] {
                 if self.len() == 0 {
@@ -600,7 +598,7 @@
         rng.fill(&mut array[..]);
         assert_eq!(array, [x as u32, (x >> 32) as u32]);
         assert_eq!(rng.next_u32(), x as u32);
-        
+
         // Check equivalence using wrapped arrays
         let mut warray = [Wrapping(0u32); 2];
         rng.fill(&mut warray[..]);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/adapter/read.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/adapter/read.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/adapter/read.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/adapter/read.rs	2019-09-15 11:34:34.000000000 +0000
@@ -72,7 +72,7 @@
     }
 
     fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        if dest.len() == 0 { return Ok(()); }
+        if dest.is_empty() { return Ok(()); }
         // Use `std::io::read_exact`, which retries on `ErrorKind::Interrupted`.
         self.reader.read_exact(dest).map_err(|e| Error::new(ReadError(e)))
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/adapter/reseeding.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/adapter/reseeding.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/adapter/reseeding.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/adapter/reseeding.rs	2019-09-15 11:34:34.000000000 +0000
@@ -225,6 +225,7 @@
                            results: &mut <Self as BlockRngCore>::Results,
                            global_fork_counter: usize)
     {
+        #![allow(clippy::if_same_then_else)]  // false positive
         if self.is_forked(global_fork_counter) {
             info!("Fork detected, reseeding RNG");
         } else {
@@ -300,7 +301,7 @@
     }
 
     pub fn register_fork_handler() {
-        if FORK_HANDLER_REGISTERED.load(Ordering::Relaxed) == false {
+        if !FORK_HANDLER_REGISTERED.load(Ordering::Relaxed) {
             unsafe { libc::pthread_atfork(None, None, Some(fork_handler)) };
             FORK_HANDLER_REGISTERED.store(true, Ordering::Relaxed);
         }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/entropy.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/entropy.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/entropy.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/entropy.rs	2019-09-15 11:34:34.000000000 +0000
@@ -11,7 +11,6 @@
 #![allow(deprecated)]   // whole module is deprecated
 
 use rand_core::{RngCore, CryptoRng, Error};
-#[allow(unused)]
 use crate::rngs::OsRng;
 
 /// An interface returning random data from external source(s), provided
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/mock.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/mock.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/mock.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/mock.rs	2019-09-15 11:34:34.000000000 +0000
@@ -58,6 +58,7 @@
 
     #[inline]
     fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        Ok(self.fill_bytes(dest))
+        self.fill_bytes(dest);
+        Ok(())
     }
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/mod.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/mod.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/mod.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/mod.rs	2019-09-15 11:34:34.000000000 +0000
@@ -116,5 +116,4 @@
 pub use self::std::StdRng;
 #[cfg(feature="std")] pub use self::thread::ThreadRng;
 
-#[cfg(feature="getrandom")] mod os;
-#[cfg(feature="getrandom")] pub use self::os::OsRng;
+#[cfg(feature="getrandom")] pub use rand_core::OsRng;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/os.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/os.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/os.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/os.rs	1970-01-01 00:00:00.000000000 +0000
@@ -1,95 +0,0 @@
-// Copyright 2019 Developers of the Rand project.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// https://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-//! Interface to the random number generator of the operating system.
-// Note: keep this code in sync with the rand_os crate!
-
-use crate::getrandom::getrandom;
-use rand_core::{CryptoRng, RngCore, Error, impls};
-
-/// A random number generator that retrieves randomness from from the
-/// operating system.
-///
-/// This is a zero-sized struct. It can be freely constructed with `OsRng`.
-///
-/// The implementation is provided by the [getrandom] crate. Refer to
-/// [getrandom] documentation for details.
-///
-/// # Blocking and error handling
-///
-/// It is possible that when used during early boot the first call to `OsRng`
-/// will block until the system's RNG is initialised. It is also possible
-/// (though highly unlikely) for `OsRng` to fail on some platforms, most
-/// likely due to system mis-configuration.
-///
-/// After the first successful call, it is highly unlikely that failures or
-/// significant delays will occur (although performance should be expected to
-/// be much slower than a user-space PRNG).
-///
-/// # Usage example
-/// ```
-/// use rand::rngs::{StdRng, OsRng};
-/// use rand::{RngCore, SeedableRng};
-///
-/// let mut key = [0u8; 16];
-/// OsRng.fill_bytes(&mut key);
-/// let random_u64 = OsRng.next_u64();
-/// 
-/// // OsRng is especially useful for seeding other RNGs (see also from_entropy)
-/// let mut rng = StdRng::from_rng(OsRng).unwrap();
-/// let _ = rng.next_u32();
-/// ```
-///
-/// [getrandom]: https://crates.io/crates/getrandom
-#[derive(Clone, Copy, Debug, Default)]
-pub struct OsRng;
-
-impl OsRng {
-    /// Create a new `OsRng`.
-    #[deprecated(since="0.7.0", note="replace OsRng::new().unwrap() with just OsRng")]
-    pub fn new() -> Result<OsRng, Error> {
-        Ok(OsRng)
-    }
-}
-
-impl CryptoRng for OsRng {}
-
-impl RngCore for OsRng {
-    fn next_u32(&mut self) -> u32 {
-        impls::next_u32_via_fill(self)
-    }
-
-    fn next_u64(&mut self) -> u64 {
-        impls::next_u64_via_fill(self)
-    }
-
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        if let Err(e) = self.try_fill_bytes(dest) {
-            panic!("Error: {}", e);
-        }
-    }
-
-    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Error> {
-        getrandom(dest)?;
-        Ok(())
-    }
-}
-
-#[test]
-fn test_os_rng() {
-    let x = OsRng.next_u64();
-    let y = OsRng.next_u64();
-    assert!(x != 0);
-    assert!(x != y);
-}
-
-#[test]
-fn test_construction() {
-    let mut rng = OsRng::default();
-    assert!(rng.next_u64() != 0);
-}
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/small.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/small.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/small.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/small.rs	2019-09-15 11:34:34.000000000 +0000
@@ -34,8 +34,8 @@
 /// The PRNG algorithm in `SmallRng` is chosen to be
 /// efficient on the current platform, without consideration for cryptography
 /// or security. The size of its state is much smaller than [`StdRng`].
-/// The current algorithm is [`Pcg64Mcg`][rand_pcg::Pcg64Mcg] on 64-bit
-/// platforms and [`Pcg32`][rand_pcg::Pcg32] on 32-bit platforms. Both are
+/// The current algorithm is [`Pcg64Mcg`](rand_pcg::Pcg64Mcg) on 64-bit
+/// platforms and [`Pcg32`](rand_pcg::Pcg32) on 32-bit platforms. Both are
 /// implemented by the [rand_pcg] crate.
 ///
 /// # Examples
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/std.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/std.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/rngs/std.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/rngs/std.rs	2019-09-15 11:34:34.000000000 +0000
@@ -10,8 +10,11 @@
 
 use crate::{RngCore, CryptoRng, Error, SeedableRng};
 
-#[cfg(target_os = "emscripten")] pub(crate) use rand_hc::Hc128Core as Core;
-#[cfg(not(target_os = "emscripten"))] pub(crate) use rand_chacha::ChaCha20Core as Core;
+#[cfg(all(any(test, feature = "std"), target_os = "emscripten"))]
+pub(crate) use rand_hc::Hc128Core as Core;
+#[cfg(all(any(test, feature = "std"), not(target_os = "emscripten")))]
+pub(crate) use rand_chacha::ChaCha20Core as Core;
+
 #[cfg(target_os = "emscripten")] use rand_hc::Hc128Rng as Rng;
 #[cfg(not(target_os = "emscripten"))] use rand_chacha::ChaCha20Rng as Rng;
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/seq/index.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/seq/index.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/seq/index.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/seq/index.rs	2019-09-15 11:34:34.000000000 +0000
@@ -30,10 +30,20 @@
 
 impl IndexVec {
     /// Returns the number of indices
+    #[inline]
     pub fn len(&self) -> usize {
-        match self {
-            &IndexVec::U32(ref v) => v.len(),
-            &IndexVec::USize(ref v) => v.len(),
+        match *self {
+            IndexVec::U32(ref v) => v.len(),
+            IndexVec::USize(ref v) => v.len(),
+        }
+    }
+
+    /// Returns `true` if the length is 0.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        match *self {
+            IndexVec::U32(ref v) => v.is_empty(),
+            IndexVec::USize(ref v) => v.is_empty(),
         }
     }
 
@@ -41,14 +51,16 @@
     ///
     /// (Note: we cannot implement [`std::ops::Index`] because of lifetime
     /// restrictions.)
+    #[inline]
     pub fn index(&self, index: usize) -> usize {
-        match self {
-            &IndexVec::U32(ref v) => v[index] as usize,
-            &IndexVec::USize(ref v) => v[index],
+        match *self {
+            IndexVec::U32(ref v) => v[index] as usize,
+            IndexVec::USize(ref v) => v[index],
         }
     }
 
     /// Return result as a `Vec<usize>`. Conversion may or may not be trivial.
+    #[inline]
     pub fn into_vec(self) -> Vec<usize> {
         match self {
             IndexVec::U32(v) => v.into_iter().map(|i| i as usize).collect(),
@@ -57,14 +69,16 @@
     }
 
     /// Iterate over the indices as a sequence of `usize` values
-    pub fn iter<'a>(&'a self) -> IndexVecIter<'a> {
-        match self {
-            &IndexVec::U32(ref v) => IndexVecIter::U32(v.iter()),
-            &IndexVec::USize(ref v) => IndexVecIter::USize(v.iter()),
+    #[inline]
+    pub fn iter(&self) -> IndexVecIter<'_> {
+        match *self {
+            IndexVec::U32(ref v) => IndexVecIter::U32(v.iter()),
+            IndexVec::USize(ref v) => IndexVecIter::USize(v.iter()),
         }
     }
 
     /// Convert into an iterator over the indices as a sequence of `usize` values
+    #[inline]
     pub fn into_iter(self) -> IndexVecIntoIter {
         match self {
             IndexVec::U32(v) => IndexVecIntoIter::U32(v.into_iter()),
@@ -88,12 +102,14 @@
 }
 
 impl From<Vec<u32>> for IndexVec {
+    #[inline]
     fn from(v: Vec<u32>) -> Self {
         IndexVec::U32(v)
     }
 }
 
 impl From<Vec<usize>> for IndexVec {
+    #[inline]
     fn from(v: Vec<usize>) -> Self {
         IndexVec::USize(v)
     }
@@ -108,18 +124,20 @@
 
 impl<'a> Iterator for IndexVecIter<'a> {
     type Item = usize;
+    #[inline]
     fn next(&mut self) -> Option<usize> {
         use self::IndexVecIter::*;
-        match self {
-            &mut U32(ref mut iter) => iter.next().map(|i| *i as usize),
-            &mut USize(ref mut iter) => iter.next().cloned(),
+        match *self {
+            U32(ref mut iter) => iter.next().map(|i| *i as usize),
+            USize(ref mut iter) => iter.next().cloned(),
         }
     }
 
+    #[inline]
     fn size_hint(&self) -> (usize, Option<usize>) {
-        match self {
-            &IndexVecIter::U32(ref v) => v.size_hint(),
-            &IndexVecIter::USize(ref v) => v.size_hint(),
+        match *self {
+            IndexVecIter::U32(ref v) => v.size_hint(),
+            IndexVecIter::USize(ref v) => v.size_hint(),
         }
     }
 }
@@ -136,19 +154,21 @@
 impl Iterator for IndexVecIntoIter {
     type Item = usize;
 
+    #[inline]
     fn next(&mut self) -> Option<Self::Item> {
         use self::IndexVecIntoIter::*;
-        match self {
-            &mut U32(ref mut v) => v.next().map(|i| i as usize),
-            &mut USize(ref mut v) => v.next(),
+        match *self {
+            U32(ref mut v) => v.next().map(|i| i as usize),
+            USize(ref mut v) => v.next(),
         }
     }
 
+    #[inline]
     fn size_hint(&self) -> (usize, Option<usize>) {
         use self::IndexVecIntoIter::*;
-        match self {
-            &U32(ref v) => v.size_hint(),
-            &USize(ref v) => v.size_hint(),
+        match *self {
+            U32(ref v) => v.size_hint(),
+            USize(ref v) => v.size_hint(),
         }
     }
 }
@@ -239,11 +259,9 @@
                 indices.insert(pos, j);
                 continue;
             }
-        } else {
-            if indices.contains(&t) {
-                indices.push(j);
-                continue;
-            }
+        } else if indices.contains(&t) {
+            indices.push(j);
+            continue;
         }
         indices.push(t);
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/seq/mod.rs firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/seq/mod.rs
--- firefox-trunk-71.0~a1~hg20190913r492975/third_party/cbindgen/vendor/rand/src/seq/mod.rs	2019-09-13 05:14:37.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/third_party/cbindgen/vendor/rand/src/seq/mod.rs	2019-09-15 11:34:34.000000000 +0000
@@ -265,13 +265,12 @@
         loop {
             if lower > 1 {
                 let ix = gen_index(rng, lower + consumed);
-                let skip;
-                if ix < lower {
+                let skip = if ix < lower {
                     result = self.nth(ix);
-                    skip = lower - (ix + 1);
+                    lower - (ix + 1)
                 } else {
-                    skip = lower;
-                }
+                    lower
+                };
                 if upper == Some(lower) {
                     return result;
                 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/actors/DateTimePickerChild.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/actors/DateTimePickerChild.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/actors/DateTimePickerChild.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/actors/DateTimePickerChild.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -176,8 +176,7 @@
           detail: {
             // Pass partial value if it's available, otherwise pass input
             // element's value.
-            value:
-              Object.keys(value).length > 0 ? value : this._inputElement.value,
+            value: Object.keys(value).length ? value : this._inputElement.value,
             min: this._inputElement.getMinimum(),
             max: this._inputElement.getMaximum(),
             step: this._inputElement.getStep(),
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/actors/PictureInPictureChild.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/actors/PictureInPictureChild.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/actors/PictureInPictureChild.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/actors/PictureInPictureChild.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -619,7 +619,11 @@
     }
 
     state.weakOverVideo = null;
-    state.hideToggleDeferredTask.disarm();
+
+    if (!this.toggleTesting) {
+      state.hideToggleDeferredTask.disarm();
+    }
+
     state.hideToggleDeferredTask = null;
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/actors/PopupBlockingChild.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/actors/PopupBlockingChild.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/actors/PopupBlockingChild.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/actors/PopupBlockingChild.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -140,7 +140,7 @@
           this.popupDataInternal.splice(i, 1);
         }
       }
-      if (this.popupData.length == 0) {
+      if (!this.popupData.length) {
         this.popupData = null;
         this.popupDataInternal = null;
       }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/actors/SelectChild.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/actors/SelectChild.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/actors/SelectChild.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/actors/SelectChild.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -26,6 +26,8 @@
 const kStateActive = 0x00000001; // NS_EVENT_STATE_ACTIVE
 const kStateHover = 0x00000004; // NS_EVENT_STATE_HOVER
 
+// Duplicated in SelectParent.jsm
+// Please keep these lists in sync.
 const SUPPORTED_PROPERTIES = [
   "direction",
   "color",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/actors/SelectParent.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/actors/SelectParent.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/actors/SelectParent.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/actors/SelectParent.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -24,6 +24,19 @@
   "text-shadow",
 ];
 
+// Duplicated in SelectChild.jsm
+// Please keep these lists in sync.
+const SUPPORTED_PROPERTIES = [
+  "direction",
+  "color",
+  "background-color",
+  "text-shadow",
+  "font-family",
+  "font-weight",
+  "font-size",
+  "font-style",
+];
+
 const customStylingEnabled = Services.prefs.getBoolPref(
   "dom.forms.select.customstyling"
 );
@@ -94,17 +107,6 @@
       selectStyle["background-color"] = uaStyle["background-color"];
     }
 
-    // Some webpages set the <select> backgroundColor to transparent,
-    // but they don't intend to change the popup to transparent.
-    if (
-      customStylingEnabled &&
-      selectStyle["background-color"] != uaStyle["background-color"]
-    ) {
-      let color = selectStyle["background-color"];
-      selectStyle["background-image"] = `linear-gradient(${color}, ${color});`;
-      selectBackgroundSet = true;
-    }
-
     if (selectStyle.color == selectStyle["background-color"]) {
       selectStyle.color = uaStyle.color;
     }
@@ -119,22 +121,41 @@
         );
       }
 
-      let ruleBody = "";
-      for (let property in selectStyle) {
-        if (property == "background-color" || property == "direction") {
+      let addedRule = false;
+      for (let property of SUPPORTED_PROPERTIES) {
+        if (property == "direction") {
           continue;
         } // Handled above, or before.
-        if (selectStyle[property] != uaStyle[property]) {
-          ruleBody += `${property}: ${selectStyle[property]};`;
+        if (
+          !selectStyle[property] ||
+          selectStyle[property] == uaStyle[property]
+        ) {
+          continue;
+        }
+        if (!addedRule) {
+          sheet.insertRule("#ContentSelectDropdown > menupopup {}", 0);
+          addedRule = true;
         }
+        sheet.cssRules[0].style[property] = selectStyle[property];
       }
-      if (ruleBody) {
-        sheet.insertRule(
-          `#ContentSelectDropdown > menupopup {
-          ${ruleBody}
-        }`,
-          0
-        );
+      // Some webpages set the <select> backgroundColor to transparent,
+      // but they don't intend to change the popup to transparent.
+      // So we remove the backgroundColor and turn it into an image instead.
+      if (
+        customStylingEnabled &&
+        selectStyle["background-color"] != uaStyle["background-color"]
+      ) {
+        // We intentionally use the parsed color to prevent color
+        // values like `url(..)` being injected into the
+        // `background-image` property.
+        let parsedColor = sheet.cssRules[0].style["background-color"];
+        sheet.cssRules[0].style["background-color"] = "";
+        sheet.cssRules[0].style[
+          "background-image"
+        ] = `linear-gradient(${parsedColor}, ${parsedColor})`;
+        selectBackgroundSet = true;
+      }
+      if (addedRule) {
         sheet.insertRule(
           `#ContentSelectDropdown > menupopup > :not([_moz-menuactive="true"]) {
             color: inherit;
@@ -416,29 +437,30 @@
       }
 
       if (customStylingEnabled) {
-        let ruleBody = "";
-        for (let property in style) {
+        let addedRule = false;
+        for (const property of SUPPORTED_PROPERTIES) {
           if (property == "direction" || property == "font-size") {
             continue;
           } // handled above
-          if (style[property] == selectStyle[property]) {
+          if (!style[property] || style[property] == selectStyle[property]) {
             continue;
           }
           if (PROPERTIES_RESET_WHEN_ACTIVE.includes(property)) {
-            ruleBody += `${property}: ${style[property]};`;
+            if (!addedRule) {
+              sheet.insertRule(
+                `#ContentSelectDropdown > menupopup > :nth-child(${nthChildIndex}):not([_moz-menuactive="true"]) {
+              }`,
+                0
+              );
+              addedRule = true;
+            }
+            sheet.cssRules[0].style[property] = style[property];
           } else {
             item.style.setProperty(property, style[property]);
           }
         }
 
-        if (ruleBody) {
-          sheet.insertRule(
-            `#ContentSelectDropdown > menupopup > :nth-child(${nthChildIndex}):not([_moz-menuactive="true"]) {
-            ${ruleBody}
-          }`,
-            0
-          );
-
+        if (addedRule) {
           if (
             style["text-shadow"] != "none" &&
             style["text-shadow"] != selectStyle["text-shadow"]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/aboutmemory/content/aboutMemory.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/aboutmemory/content/aboutMemory.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/aboutmemory/content/aboutMemory.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/aboutmemory/content/aboutMemory.js	2019-09-15 11:33:29.000000000 +0000
@@ -1747,7 +1747,7 @@
     );
   }
 
-  if (gUnsafePathsWithInvalidValuesForThisProcess.length > 0) {
+  if (gUnsafePathsWithInvalidValuesForThisProcess.length) {
     let div = appendElement(aP, "div");
     appendElementWithText(
       div,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/aboutperformance/content/aboutPerformance.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/aboutperformance/content/aboutPerformance.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/aboutperformance/content/aboutPerformance.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/aboutperformance/content/aboutPerformance.js	2019-09-15 11:33:30.000000000 +0000
@@ -269,7 +269,7 @@
    */
   async update() {
     // If the buffer is empty, add one value for bootstraping purposes.
-    if (this._buffer.length == 0) {
+    if (!this._buffer.length) {
       this._latest = await this._promiseSnapshot();
       this._buffer.push(this._latest);
       await wait(BUFFER_SAMPLING_RATE_MS * 1.1);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/antitracking/test/browser/antitracking_head.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/antitracking/test/browser/antitracking_head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/antitracking/test/browser/antitracking_head.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/antitracking/test/browser/antitracking_head.js	2019-09-15 11:33:30.000000000 +0000
@@ -671,7 +671,7 @@
       if (expectedCategory == "") {
         is(allMessages.length, 0, "No console messages should be generated");
       } else {
-        ok(allMessages.length != 0, "Some console message should be generated");
+        ok(!!allMessages.length, "Some console message should be generated");
       }
       for (let msg of allMessages) {
         is(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/apppicker/content/appPicker.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/apppicker/content/appPicker.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/apppicker/content/appPicker.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/apppicker/content/appPicker.js	2019-09-15 11:33:30.000000000 +0000
@@ -78,7 +78,7 @@
 
     var primaryCount = 0;
 
-    if (!fileList || fileList.length == 0) {
+    if (!fileList || !fileList.length) {
       // display a message saying nothing is configured
       document.getElementById("app-picker-notfound").removeAttribute("hidden");
       return;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/autocomplete/tests/unit/test_378079.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/autocomplete/tests/unit/test_378079.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/autocomplete/tests/unit/test_378079.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/autocomplete/tests/unit/test_378079.js	2019-09-15 11:33:31.000000000 +0000
@@ -64,7 +64,7 @@
   this._comments = aComments;
   this._styles = aStyles;
 
-  if (this._values.length > 0) {
+  if (this._values.length) {
     this.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
   } else {
     this.searchResult = Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/autocomplete/tests/unit/test_393191.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/autocomplete/tests/unit/test_393191.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/autocomplete/tests/unit/test_393191.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/autocomplete/tests/unit/test_393191.js	2019-09-15 11:33:30.000000000 +0000
@@ -63,7 +63,7 @@
   this._comments = aComments;
   this._styles = aStyles;
 
-  if (this._values.length > 0) {
+  if (this._values.length) {
     this.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
   } else {
     this.searchResult = Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/autocomplete/tests/unit/test_440866.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/autocomplete/tests/unit/test_440866.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/autocomplete/tests/unit/test_440866.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/autocomplete/tests/unit/test_440866.js	2019-09-15 11:33:30.000000000 +0000
@@ -62,7 +62,7 @@
   this._comments = aComments;
   this._styles = aStyles;
 
-  if (this._values.length > 0) {
+  if (this._values.length) {
     this.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
   } else {
     this.searchResult = Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/autocomplete/tests/unit/test_autocomplete_multiple.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/autocomplete/tests/unit/test_autocomplete_multiple.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/autocomplete/tests/unit/test_autocomplete_multiple.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/autocomplete/tests/unit/test_autocomplete_multiple.js	2019-09-15 11:33:30.000000000 +0000
@@ -128,14 +128,14 @@
    */
   startSearch(aSearchString, aSearchParam, aPreviousResult, aListener) {
     var result = this._result;
-    if (result._values.length > 0) {
+    if (result._values.length) {
       result.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS_ONGOING;
     } else {
       result.searchResult = Ci.nsIAutoCompleteResult.RESULT_NOMATCH_ONGOING;
     }
     aListener.onSearchResult(this, result);
 
-    if (result._values.length > 0) {
+    if (result._values.length) {
       result.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
     } else {
       result.searchResult = Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/autocomplete/tests/unit/test_previousResult.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/autocomplete/tests/unit/test_previousResult.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/autocomplete/tests/unit/test_previousResult.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/autocomplete/tests/unit/test_previousResult.js	2019-09-15 11:33:30.000000000 +0000
@@ -63,7 +63,7 @@
   this._values = aValues;
   this._comments = aComments;
   this._styles = aStyles;
-  if (this._values.length > 0) {
+  if (this._values.length) {
     this.searchResult = Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
   } else {
     this.searchResult = Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/backgroundhangmonitor/tests/test_BHRObserver.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/backgroundhangmonitor/tests/test_BHRObserver.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/backgroundhangmonitor/tests/test_BHRObserver.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/backgroundhangmonitor/tests/test_BHRObserver.js	2019-09-15 11:33:30.000000000 +0000
@@ -94,7 +94,7 @@
 
     // hang.stack
     ok(Array.isArray(hang.stack));
-    ok(hang.stack.length > 0);
+    ok(!!hang.stack.length);
     hang.stack.forEach(entry => {
       // Each stack frame entry is either a native or pseudostack entry. A
       // native stack entry is an array with module index (number), and offset
@@ -141,7 +141,7 @@
 
     // hang.stack
     ok(Array.isArray(hang.stack));
-    ok(hang.stack.length > 0);
+    ok(!!hang.stack.length);
     hang.stack.forEach(entry => {
       // Each stack frame entry is either a native or pseudostack entry. A
       // native stack entry is an array with module index (number), and offset
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/certviewer/content/certviewer.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/certviewer/content/certviewer.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/certviewer/content/certviewer.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/certviewer/content/certviewer.js	2019-09-15 11:33:30.000000000 +0000
@@ -47,7 +47,7 @@
 
 const addToResultUsing = (callback, certItems, sectionTitle, Critical) => {
   let items = callback();
-  if (items.length > 0) {
+  if (items.length) {
     certItems.push({
       sectionTitle,
       sectionItems: items,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/contentprefs/ContentPrefService2.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/contentprefs/ContentPrefService2.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/contentprefs/ContentPrefService2.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/contentprefs/ContentPrefService2.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -940,7 +940,7 @@
           ? Ci.nsIContentPrefCallback2.COMPLETE_OK
           : Ci.nsIContentPrefCallback2.COMPLETE_ERROR,
         ok,
-        rows && rows.length > 0
+        rows && !!rows.length
       );
     } catch (e) {
       Cu.reportError(e);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/crashes/tests/xpcshell/test_crash_service.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/crashes/tests/xpcshell/test_crash_service.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/crashes/tests/xpcshell/test_crash_service.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/crashes/tests/xpcshell/test_crash_service.js	2019-09-15 11:33:30.000000000 +0000
@@ -93,11 +93,11 @@
     Assert.equal(stackTraces.status, "OK");
     Assert.ok(stackTraces.crash_info, "The crash_info field is populated.");
     Assert.ok(
-      stackTraces.modules && stackTraces.modules.length > 0,
+      stackTraces.modules && !!stackTraces.modules.length,
       "The module list is populated."
     );
     Assert.ok(
-      stackTraces.threads && stackTraces.threads.length > 0,
+      stackTraces.threads && !!stackTraces.threads.length,
       "The thread list is populated."
     );
 
@@ -114,7 +114,7 @@
     }
 
     let frames = stackTraces.threads[0].frames;
-    Assert.ok(frames && frames.length > 0, "The stack trace is present.\n");
+    Assert.ok(frames && !!frames.length, "The stack trace is present.\n");
   } catch (e) {
     Assert.ok(false, "StackTraces does not contain valid JSON.");
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/ctypes/tests/unit/test_jsctypes.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/ctypes/tests/unit/test_jsctypes.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/ctypes/tests/unit/test_jsctypes.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/ctypes/tests/unit/test_jsctypes.js	2019-09-15 11:33:29.000000000 +0000
@@ -2853,7 +2853,7 @@
   Assert.equal(f_t.size, undefined);
   Assert.ok(f_t.abi === ctypes.default_abi);
   Assert.ok(f_t.returnType === g_t);
-  Assert.ok(f_t.argTypes.length == 0);
+  Assert.ok(!f_t.argTypes.length);
 
   Assert.equal(f_t.toString(), "type " + name);
   Assert.equal(f_t.toSource(), "ctypes.FunctionType(ctypes.default_abi, g_t)");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/enterprisepolicies/EnterprisePolicies.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/enterprisepolicies/EnterprisePolicies.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/enterprisepolicies/EnterprisePolicies.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/enterprisepolicies/EnterprisePolicies.js	2019-09-15 11:33:30.000000000 +0000
@@ -188,7 +188,7 @@
 
   _runPoliciesCallbacks(timing) {
     let callbacks = this._callbacks[timing];
-    while (callbacks.length > 0) {
+    while (callbacks.length) {
       let callback = callbacks.shift();
       try {
         callback();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ExtensionChild.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ExtensionChild.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ExtensionChild.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ExtensionChild.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -839,7 +839,7 @@
 
     /* eslint-disable mozilla/balanced-listeners */
     this.on("add-permissions", (ignoreEvent, permissions) => {
-      if (permissions.permissions.length > 0) {
+      if (permissions.permissions.length) {
         let perms = new Set(this.policy.permissions);
         for (let perm of permissions.permissions) {
           perms.add(perm);
@@ -847,7 +847,7 @@
         this.policy.permissions = perms;
       }
 
-      if (permissions.origins.length > 0) {
+      if (permissions.origins.length) {
         let patterns = this.whiteListedHosts.patterns.map(host => host.pattern);
 
         this.policy.allowedOrigins = new MatchPatternSet(
@@ -858,7 +858,7 @@
     });
 
     this.on("remove-permissions", (ignoreEvent, permissions) => {
-      if (permissions.permissions.length > 0) {
+      if (permissions.permissions.length) {
         let perms = new Set(this.policy.permissions);
         for (let perm of permissions.permissions) {
           perms.delete(perm);
@@ -866,7 +866,7 @@
         this.policy.permissions = perms;
       }
 
-      if (permissions.origins.length > 0) {
+      if (permissions.origins.length) {
         let origins = permissions.origins.map(
           origin => new MatchPattern(origin, { ignorePath: true }).pattern
         );
@@ -1198,7 +1198,7 @@
 
     this.permissionsChangedCallbacks = new Set();
     this.updatePermissions = null;
-    if (this.context.extension.optionalPermissions.length > 0) {
+    if (this.context.extension.optionalPermissions.length) {
       this.updatePermissions = () => {
         for (let callback of this.permissionsChangedCallbacks) {
           try {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ExtensionContent.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ExtensionContent.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ExtensionContent.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ExtensionContent.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -355,7 +355,7 @@
   }
 
   get requiresCleanup() {
-    return !this.removeCSS && (this.css.length > 0 || this.cssCodeHash);
+    return !this.removeCSS && (!!this.css.length || this.cssCodeHash);
   }
 
   async addCSSCode(cssCode) {
@@ -531,7 +531,7 @@
         // problem since there are no network loads involved, and since we cache
         // the stylesheets on first load. We should fix this up if it does becomes
         // a problem.
-        if (this.css.length > 0) {
+        if (this.css.length) {
           context.contentWindow.document.blockParsing(cssPromise, {
             blockScriptCreated: false,
           });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/Extension.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/Extension.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/Extension.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/Extension.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -939,7 +939,7 @@
       // Check if there's a root directory `/localization` in the langpack.
       // If there is one, add it with the name `toolkit` as a FileSource.
       const entries = await this.readDirectory("localization");
-      if (entries.length > 0) {
+      if (entries.length) {
         l10nRegistrySources.toolkit = "";
       }
 
@@ -1404,10 +1404,9 @@
         "webextPerms.sideloadHeader",
         ["<>"]
       );
-      let key =
-        result.msgs.length == 0
-          ? "webextPerms.sideloadTextNoPerms"
-          : "webextPerms.sideloadText2";
+      let key = !result.msgs.length
+        ? "webextPerms.sideloadTextNoPerms"
+        : "webextPerms.sideloadText2";
       result.text = bundle.GetStringFromName(key);
       result.acceptText = bundle.GetStringFromName(
         "webextPerms.sideloadEnable.label"
@@ -1652,7 +1651,7 @@
         this.permissions.add(perm);
       }
 
-      if (permissions.origins.length > 0) {
+      if (permissions.origins.length) {
         let patterns = this.whiteListedHosts.patterns.map(host => host.pattern);
 
         this.whiteListedHosts = new MatchPatternSet(
@@ -2498,7 +2497,7 @@
 
   async startup(reason) {
     this.chromeRegistryHandle = null;
-    if (this.startupData.chromeEntries.length > 0) {
+    if (this.startupData.chromeEntries.length) {
       const manifestURI = Services.io.newURI(
         "manifest.json",
         null,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ExtensionParent.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ExtensionParent.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ExtensionParent.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ExtensionParent.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -135,14 +135,14 @@
     let disabledIds = AddonManager.getStartupChanges(
       AddonManager.STARTUP_CHANGE_DISABLED
     );
-    if (disabledIds.length > 0) {
+    if (disabledIds.length) {
       this._callHandlers(disabledIds, "disable", "onDisable");
     }
 
     let uninstalledIds = AddonManager.getStartupChanges(
       AddonManager.STARTUP_CHANGE_UNINSTALLED
     );
-    if (uninstalledIds.length > 0) {
+    if (uninstalledIds.length) {
       this._callHandlers(uninstalledIds, "uninstall", "onUninstall");
     }
   }
@@ -706,11 +706,7 @@
 
   _onExtensionBrowser(type, browser, additionalData = {}) {
     browser.messageManager.loadFrameScript(
-      `data:,
-      Components.utils.import("resource://gre/modules/Services.jsm");
-
-      Services.obs.notifyObservers(this, "tab-content-frameloader-created", "");
-    `,
+      "resource://gre/modules/onExtensionBrowser.js",
       false,
       true
     );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ExtensionPermissions.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ExtensionPermissions.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ExtensionPermissions.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ExtensionPermissions.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -121,7 +121,7 @@
       }
     }
 
-    if (added.permissions.length > 0 || added.origins.length > 0) {
+    if (added.permissions.length || added.origins.length) {
       await this._update(extensionId, { permissions, origins });
       if (emitter) {
         emitter.emit("add-permissions", added);
@@ -160,7 +160,7 @@
       }
     }
 
-    if (removed.permissions.length > 0 || removed.origins.length > 0) {
+    if (removed.permissions.length || removed.origins.length) {
       await this._update(extensionId, { permissions, origins });
       if (emitter) {
         emitter.emit("remove-permissions", removed);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/extensionProcessScriptLoader.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/extensionProcessScriptLoader.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/extensionProcessScriptLoader.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/extensionProcessScriptLoader.js	2019-09-15 11:33:30.000000000 +0000
@@ -0,0 +1,6 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+ChromeUtils.import("resource://gre/modules/ExtensionProcessScript.jsm");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ExtensionStorageSync.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ExtensionStorageSync.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ExtensionStorageSync.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ExtensionStorageSync.jsm	2019-09-15 11:33:29.000000000 +0000
@@ -819,7 +819,7 @@
     const extensions = await this.getExtensions();
     const extIds = Array.from(extensions, extension => extension.id);
     log.debug(`Syncing extension settings for ${JSON.stringify(extIds)}`);
-    if (extIds.length == 0) {
+    if (!extIds.length) {
       // No extensions to sync. Get out.
       return;
     }
@@ -908,7 +908,7 @@
         newValue: accepted.data,
       };
     }
-    if (Object.keys(changes).length > 0) {
+    if (Object.keys(changes).length) {
       this.notifyListeners(extension, changes);
     }
     log.info(`Successfully synced '${collection.name}'`);
@@ -1059,7 +1059,7 @@
     };
     await this.cryptoCollection.upsert(newRecord);
     const result = await this._syncKeyRing(newRecord);
-    if (result.resolved.length != 0) {
+    if (result.resolved.length) {
       // We had a conflict which was automatically resolved. We now
       // have a new keyring which might have keys for the
       // collections. Recurse.
@@ -1142,7 +1142,7 @@
       // UUID. If so, reset our sync status, so that we'll reupload
       // everything.
       const result = await this.cryptoCollection.sync(this);
-      if (result.resolved.length > 0) {
+      if (result.resolved.length) {
         // Automatically-resolved conflict. It should
         // be for the keys record.
         const resolutionIds = result.resolved.map(resolution => resolution.id);
@@ -1319,7 +1319,7 @@
       },
       { preloadIds: ids }
     );
-    if (Object.keys(changes).length > 0) {
+    if (Object.keys(changes).length) {
       this.notifyListeners(extension, changes);
     }
     const histogram = this._telemetry.getKeyedHistogramById(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/MatchURLFilters.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/MatchURLFilters.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/MatchURLFilters.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/MatchURLFilters.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -21,7 +21,7 @@
       throw new TypeError("filters should be an array");
     }
 
-    if (filters.length == 0) {
+    if (!filters.length) {
       throw new Error("filters array should not be empty");
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/MessageChannel.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/MessageChannel.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/MessageChannel.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/MessageChannel.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -892,7 +892,7 @@
 
     // At least one handler is required for all response types but
     // RESPONSE_ALL.
-    if (handlers.length == 0 && responseType != this.RESPONSE_ALL) {
+    if (!handlers.length && responseType != this.RESPONSE_ALL) {
       return Promise.reject({
         result: MessageChannel.RESULT_NO_HANDLER,
         message: "No matching message handler",
@@ -927,7 +927,7 @@
 
     switch (responseType) {
       case this.RESPONSE_FIRST:
-        if (responses.length == 0) {
+        if (!responses.length) {
           return Promise.reject({
             result: MessageChannel.RESULT_NO_RESPONSE,
             message: "No handler returned a response",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/moz.build firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/moz.build
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/moz.build	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/moz.build	2019-09-15 11:33:30.000000000 +0000
@@ -20,6 +20,7 @@
     'ExtensionPermissions.jsm',
     'ExtensionPreferencesManager.jsm',
     'ExtensionProcessScript.jsm',
+    'extensionProcessScriptLoader.js',
     'ExtensionSettingsStore.jsm',
     'ExtensionShortcuts.jsm',
     'ExtensionStorage.jsm',
@@ -33,6 +34,7 @@
     'MessageManagerProxy.jsm',
     'NativeManifests.jsm',
     'NativeMessaging.jsm',
+    'onExtensionBrowser.js',
     'PerformanceCounters.jsm',
     'ProxyScriptContext.jsm',
     'Schemas.jsm',
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/NativeMessaging.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/NativeMessaging.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/NativeMessaging.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/NativeMessaging.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -198,7 +198,7 @@
   }
 
   _startWrite() {
-    if (this.sendQueue.length == 0) {
+    if (!this.sendQueue.length) {
       return;
     }
 
@@ -230,7 +230,7 @@
       let partial = "";
       while (true) {
         let data = await proc.stderr.readString();
-        if (data.length == 0) {
+        if (!data.length) {
           // We have hit EOF, just stop reading
           if (partial) {
             Services.console.logStringMessage(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/onExtensionBrowser.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/onExtensionBrowser.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/onExtensionBrowser.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/onExtensionBrowser.js	2019-09-15 11:33:29.000000000 +0000
@@ -0,0 +1,8 @@
+/* -*- Mode: indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* vim: set sts=2 sw=2 et tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+"use strict";
+
+Services.obs.notifyObservers(this, "tab-content-frameloader-created");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/parent/ext-contentScripts.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/parent/ext-contentScripts.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/parent/ext-contentScripts.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/parent/ext-contentScripts.js	2019-09-15 11:33:29.000000000 +0000
@@ -85,7 +85,7 @@
       return blobURL;
     };
 
-    if (details.js && details.js.length > 0) {
+    if (details.js && details.js.length) {
       options.jsPaths = details.js.map(data => {
         if (data.file) {
           return data.file;
@@ -95,7 +95,7 @@
       });
     }
 
-    if (details.css && details.css.length > 0) {
+    if (details.css && details.css.length) {
       options.cssPaths = details.css.map(data => {
         if (data.file) {
           return data.file;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/parent/ext-downloads.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/parent/ext-downloads.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/parent/ext-downloads.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/parent/ext-downloads.js	2019-09-15 11:33:30.000000000 +0000
@@ -558,7 +558,7 @@
           }
 
           if (filename != null) {
-            if (filename.length == 0) {
+            if (!filename.length) {
               return Promise.reject({ message: "filename must not be empty" });
             }
 
@@ -1065,7 +1065,7 @@
                 };
               }
             });
-            if (Object.keys(changes).length > 0) {
+            if (Object.keys(changes).length) {
               changes.id = item.id;
               fire.async(changes);
             }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/parent/ext-permissions.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/parent/ext-permissions.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/parent/ext-permissions.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/parent/ext-permissions.js	2019-09-15 11:33:30.000000000 +0000
@@ -61,7 +61,7 @@
                 )
             );
 
-            if (permissions.length == 0 && origins.length == 0) {
+            if (!permissions.length && !origins.length) {
               return true;
             }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ProxyScriptContext.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ProxyScriptContext.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/ProxyScriptContext.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/ProxyScriptContext.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -343,7 +343,7 @@
         proxyData = proxyRules;
       // fall through
       case "object":
-        if (Array.isArray(proxyData) && proxyData.length > 0) {
+        if (Array.isArray(proxyData) && proxyData.length) {
           return ProxyInfoData.createProxyInfoFromData(
             proxyData,
             defaultProxyInfo
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/Schemas.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/Schemas.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/Schemas.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/Schemas.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -3160,7 +3160,7 @@
       return results[0];
     }
 
-    if (results.length > 0) {
+    if (results.length) {
       return new Namespaces(this.root, name, name.split("."), results);
     }
     return null;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/browser/browser_ext_themes_autocomplete_popup.js	2019-09-15 11:33:30.000000000 +0000
@@ -123,7 +123,7 @@
   );
 
   // Set the selected attribute to true to test the highlight popup properties
-  UrlbarTestUtils.setSelectedIndex(window, 1);
+  UrlbarTestUtils.setSelectedRowIndex(window, 1);
   let actionResult = await UrlbarTestUtils.getDetailsOfResultAt(window, 0);
   let urlResult = await UrlbarTestUtils.getDetailsOfResultAt(window, 1);
   let resultCS = window.getComputedStyle(urlResult.element.row);
@@ -142,7 +142,7 @@
 
   // Now set the index to somewhere not on the first two, so that we can test both
   // url and action text colors.
-  UrlbarTestUtils.setSelectedIndex(window, 2);
+  UrlbarTestUtils.setSelectedRowIndex(window, 2);
 
   Assert.equal(
     window.getComputedStyle(urlResult.element.url).color,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/mochitest/test_chrome_ext_webnavigation_resolved_urls.html firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/mochitest/test_chrome_ext_webnavigation_resolved_urls.html
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/mochitest/test_chrome_ext_webnavigation_resolved_urls.html	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/mochitest/test_chrome_ext_webnavigation_resolved_urls.html	2019-09-15 11:33:29.000000000 +0000
@@ -17,7 +17,7 @@
     let checkURLs;
 
     browser.webNavigation.onCompleted.addListener(async msg => {
-      if (checkURLs.length > 0) {
+      if (checkURLs.length) {
         let expectedURL = checkURLs.shift();
         browser.test.assertEq(expectedURL, msg.url, "Got the expected URL");
         await browser.tabs.remove(msg.tabId);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/mochitest/test_ext_activityLog.html firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/mochitest/test_ext_activityLog.html
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/mochitest/test_ext_activityLog.html	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/mochitest/test_ext_activityLog.html	2019-09-15 11:33:30.000000000 +0000
@@ -265,7 +265,7 @@
         JSON.stringify(details.data),
         "message matches"
       );
-      if (expecting.length == 0) {
+      if (!expecting.length) {
         await browser.tabs.remove(tab.id);
         browser.test.notifyPass("activity");
       }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/mochitest/test_ext_async_clipboard.html firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/mochitest/test_ext_async_clipboard.html
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/mochitest/test_ext_async_clipboard.html	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/mochitest/test_ext_async_clipboard.html	2019-09-15 11:33:30.000000000 +0000
@@ -331,7 +331,7 @@
       // and read from it, the data transfer object contains an item of type
       // text/plain and kind string, but we can't call getAsString on it to verify
       // that at least it is an empty string because the callback never gets invoked.
-      if (dataT.items.length == 0 ||
+      if (!dataT.items.length ||
         (dataT.items.length == 1 && dataT.items[0].type == "text/plain" &&
          dataT.items[0].kind == "string")) {
         browser.test.succeed("Read promise successfully resolved");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/mochitest/test_ext_webrequest_hsts.html	2019-09-15 11:33:30.000000000 +0000
@@ -44,7 +44,7 @@
       browser.test.assertTrue(now < cert.validity.end, "cert end validity is correct");
       if (options.rawDER) {
         for (let cert of securityInfo.certificates) {
-          browser.test.assertTrue(cert.rawDER.length > 0, "have rawDER");
+          browser.test.assertTrue(!!cert.rawDER.length, "have rawDER");
         }
       }
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_dns.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_dns.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_dns.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_dns.js	2019-09-15 11:33:30.000000000 +0000
@@ -106,7 +106,7 @@
         result.addresses.length >= test.expect.addresses.length,
         "expected number of addresses returned"
       );
-      if (test.expect.addresses.length > 0 && result.addresses.length > 0) {
+      if (test.expect.addresses.length && result.addresses.length) {
         ok(
           result.addresses.includes(test.expect.addresses[0]),
           "got expected ip address"
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_downloads_misc.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_downloads_misc.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_downloads_misc.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_downloads_misc.js	2019-09-15 11:33:31.000000000 +0000
@@ -169,7 +169,7 @@
         // expected events and we're not looking for an exact match,
         // then we just may not have seen the event yet, so return without
         // failing and check() will be called again when a new event arrives.
-        if (expected.length == 0) {
+        if (!expected.length) {
           events = remaining;
           eventWaiter = null;
           resolve();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_incognito.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_incognito.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_incognito.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_incognito.js	2019-09-15 11:33:30.000000000 +0000
@@ -29,7 +29,7 @@
   );
 
   ok(
-    snapshot.parent && snapshot.parent.length > 0,
+    snapshot.parent && !!snapshot.parent.length,
     "Got parent telemetry events in the snapshot"
   );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_proxy_socks.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_proxy_socks.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_proxy_socks.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_proxy_socks.js	2019-09-15 11:33:30.000000000 +0000
@@ -101,7 +101,7 @@
   }
 
   checkSocksGreeting() {
-    if (this.inbuf.length == 0) {
+    if (!this.inbuf.length) {
       return;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_storage_sync.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_storage_sync.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_storage_sync.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_storage_sync.js	2019-09-15 11:33:30.000000000 +0000
@@ -204,7 +204,7 @@
         }),
       };
 
-      if (this.conflicts.length > 0) {
+      if (this.conflicts.length) {
         const nextConflict = this.conflicts.shift();
         if (!nextConflict.transient) {
           this.records.push(nextConflict);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_urlclassification.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_urlclassification.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_urlclassification.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/test/xpcshell/test_ext_webRequest_urlclassification.js	2019-09-15 11:33:30.000000000 +0000
@@ -14,7 +14,7 @@
   let ns = Schemas.getNamespace("webRequest");
   let schema_enum = ns.get("UrlClassificationFlags").enumeration;
   ok(
-    schema_enum.length > 0,
+    !!schema_enum.length,
     `UrlClassificationFlags: ${JSON.stringify(schema_enum)}`
   );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/webrequest/WebRequestContent.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/webrequest/WebRequestContent.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/extensions/webrequest/WebRequestContent.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/extensions/webrequest/WebRequestContent.js	2019-09-15 11:33:30.000000000 +0000
@@ -200,7 +200,7 @@
       windowId,
       parentWindowId,
     };
-    if (frameAncestors.length > 0) {
+    if (frameAncestors.length) {
       data.frameAncestors = frameAncestors;
     }
     if (requestOrigin) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/mozintl/test/test_mozintl_getLocaleDisplayNames.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/mozintl/test/test_mozintl_getLocaleDisplayNames.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/mozintl/test/test_mozintl_getLocaleDisplayNames.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/mozintl/test/test_mozintl_getLocaleDisplayNames.js	2019-09-15 11:33:31.000000000 +0000
@@ -122,15 +122,11 @@
 add_test(function test_availableLocaleDisplayNames() {
   let langCodes = gAvLocDN("language");
   equal(
-    langCodes.length > 0,
+    !!langCodes.length,
     true,
     "There should be some language codes available"
   );
   let regCodes = gAvLocDN("region");
-  equal(
-    regCodes.length > 0,
-    true,
-    "There should be some region codes available"
-  );
+  equal(!!regCodes.length, true, "There should be some region codes available");
   run_next_test();
 });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/normandy/actions/PreferenceExperimentAction.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/normandy/actions/PreferenceExperimentAction.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/normandy/actions/PreferenceExperimentAction.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/normandy/actions/PreferenceExperimentAction.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -71,7 +71,7 @@
             );
           }
         );
-        if (conflictingPrefs.length > 0) {
+        if (conflictingPrefs.length) {
           throw new Error(
             `Experiment ${slug} ignored; another active experiment is already using the
             ${conflictingPrefs[0]} preference.`
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/normandy/lib/PreferenceExperiments.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/normandy/lib/PreferenceExperiments.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/normandy/lib/PreferenceExperiments.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/normandy/lib/PreferenceExperiments.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -426,7 +426,7 @@
       }
     );
 
-    if (preferencesWithConflicts.length > 0) {
+    if (preferencesWithConflicts.length) {
       TelemetryEvents.sendEvent("enrollFailed", "preference_study", slug, {
         reason: "pref-conflict",
       });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/normandy/lib/RecipeRunner.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/normandy/lib/RecipeRunner.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/normandy/lib/RecipeRunner.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/normandy/lib/RecipeRunner.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -238,7 +238,7 @@
         if (!this.enabled) {
           return;
         }
-        this.run({ trigger: "sync" });
+        await this.run({ trigger: "sync" });
       };
 
       gRemoteSettingsClient.on("sync", this._onSync);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/normandy/test/browser/browser_actions_PreferenceExperimentAction.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/normandy/test/browser/browser_actions_PreferenceExperimentAction.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/normandy/test/browser/browser_actions_PreferenceExperimentAction.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/normandy/test/browser/browser_actions_PreferenceExperimentAction.js	2019-09-15 11:33:31.000000000 +0000
@@ -444,7 +444,7 @@
     await action.finalize();
 
     const activeExperiments = await PreferenceExperiments.getAllActive();
-    ok(activeExperiments.length > 0);
+    ok(!!activeExperiments.length);
     Assert.deepEqual(activeExperiments, [
       {
         slug: "integration test experiment",
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/normandy/test/browser/browser_LogManager.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/normandy/test/browser/browser_LogManager.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/normandy/test/browser/browser_LogManager.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/normandy/test/browser/browser_LogManager.js	2019-09-15 11:33:30.000000000 +0000
@@ -14,7 +14,7 @@
   // Ensure that our loggers have at least one appender.
   LogManager.configure(Log.Level.Warn);
   const logger = LogManager.getLogger("test");
-  ok(logger.appenders.length > 0, "Loggers have at least one appender.");
+  ok(!!logger.appenders.length, "Loggers have at least one appender.");
 
   // Ensure our loggers log to the console.
   await new Promise(resolve => {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/osfile/modules/osfile_async_front.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/osfile/modules/osfile_async_front.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/osfile/modules/osfile_async_front.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/osfile/modules/osfile_async_front.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -355,11 +355,11 @@
           // The worker still holds resources. Report them.
 
           let msg = "";
-          if (openedFiles.length > 0) {
+          if (openedFiles.length) {
             msg +=
               "The following files are still open:\n" + openedFiles.join("\n");
           }
-          if (openedDirectoryIterators.length > 0) {
+          if (openedDirectoryIterators.length) {
             msg +=
               "The following directory iterators are still open:\n" +
               openedDirectoryIterators.join("\n");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/osfile/modules/osfile_async_worker.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/osfile/modules/osfile_async_worker.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/osfile/modules/osfile_async_worker.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/osfile/modules/osfile_async_worker.js	2019-09-15 11:33:30.000000000 +0000
@@ -179,8 +179,7 @@
 
       // Is it safe to kill the worker?
       let safe =
-        result.openedFiles.length == 0 &&
-        result.openedDirectoryIterators.length == 0;
+        !result.openedFiles.length && !result.openedDirectoryIterators.length;
       result.killed = safe && kill;
 
       return new Meta(result, { shutdown: result.killed });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/osfile/modules/ospath_unix.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/osfile/modules/ospath_unix.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/osfile/modules/ospath_unix.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/osfile/modules/ospath_unix.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -88,7 +88,7 @@
     if (subpath == null) {
       throw new TypeError("invalid path component");
     }
-    if (subpath.length == 0) {
+    if (!subpath.length) {
       continue;
     } else if (subpath[0] == "/") {
       paths = [subpath];
@@ -117,7 +117,7 @@
       case ".": // fallthrough
         break;
       case "..":
-        if (stack.length == 0) {
+        if (!stack.length) {
           if (absolute) {
             throw new Error("Path is ill-formed: attempting to go past root");
           } else {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/osfile/modules/ospath_win.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/osfile/modules/ospath_win.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/osfile/modules/ospath_win.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/osfile/modules/ospath_win.jsm	2019-09-15 11:33:29.000000000 +0000
@@ -255,7 +255,7 @@
       case ".": // Ignore
         break;
       case "..":
-        if (stack.length == 0) {
+        if (!stack.length) {
           if (absolute) {
             throw new Error("Path is ill-formed: attempting to go past root");
           } else {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/content/passwordManager.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/content/passwordManager.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/content/passwordManager.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/content/passwordManager.js	2019-09-15 11:33:30.000000000 +0000
@@ -316,7 +316,7 @@
   SignonColumnSort(lastSignonSortColumn);
 
   // disable "remove all signons" button if there are no signons
-  if (signons.length == 0) {
+  if (!signons.length) {
     removeAllButton.setAttribute("disabled", "true");
     togglePasswordsButton.setAttribute("disabled", "true");
   } else {
@@ -362,7 +362,7 @@
 }
 
 function DeleteSignon() {
-  let syncNeeded = signonsTreeView._filterSet.length != 0;
+  let syncNeeded = !!signonsTreeView._filterSet.length;
   let tree = signonsTree;
   let view = signonsTreeView;
   let table = GetVisibleLogins();
@@ -426,7 +426,7 @@
     return;
   }
 
-  let syncNeeded = signonsTreeView._filterSet.length != 0;
+  let syncNeeded = !!signonsTreeView._filterSet.length;
   let view = signonsTreeView;
   let table = GetVisibleLogins();
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginHelper.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginHelper.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginHelper.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginHelper.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -475,7 +475,7 @@
     }
 
     // Sanity check the login
-    if (newLogin.origin == null || newLogin.origin.length == 0) {
+    if (newLogin.origin == null || !newLogin.origin.length) {
       throw new Error("Can't add a login with a null or empty origin.");
     }
 
@@ -484,7 +484,7 @@
       throw new Error("Can't add a login with a null username.");
     }
 
-    if (newLogin.password == null || newLogin.password.length == 0) {
+    if (newLogin.password == null || !newLogin.password.length) {
       throw new Error("Can't add a login with a null or empty password.");
     }
 
@@ -645,7 +645,7 @@
      * over the existingLogin.
      */
     function isLoginPreferred(existingLogin, login) {
-      if (!resolveBy || resolveBy.length == 0) {
+      if (!resolveBy || !resolveBy.length) {
         // If there is no preference, prefer the existing login.
         return false;
       }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginImport.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginImport.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginImport.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginImport.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -63,7 +63,7 @@
     // Thus, merging with existing data is not a use case we support.  This
     // restriction might be removed to support re-importing passwords set by an
     // old version by flipping the import preference and restarting.
-    if (this.store.data.logins.length > 0) {
+    if (this.store.data.logins.length) {
       throw new Error(
         "Unable to import saved passwords because some data " +
           "has already been imported or saved."
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginManagerContent.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginManagerContent.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginManagerContent.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginManagerContent.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -835,10 +835,9 @@
       let rootElsWeakSet = LoginFormFactory.getRootElementsWeakSetForDocument(
         doc
       );
-      let hasLoginForm =
-        ChromeUtils.nondeterministicGetWeakSetKeys(rootElsWeakSet).filter(
-          el => el.isConnected
-        ).length > 0;
+      let hasLoginForm = !!ChromeUtils.nondeterministicGetWeakSetKeys(
+        rootElsWeakSet
+      ).filter(el => el.isConnected).length;
       return (
         (hasLoginForm && !thisWindow.isSecureContext) ||
         Array.prototype.some.call(thisWindow.frames, frame =>
@@ -1117,7 +1116,7 @@
     }
 
     // If too few or too many fields, bail out.
-    if (pwFields.length == 0) {
+    if (!pwFields.length) {
       log("(form ignored -- no password fields.)");
       return null;
     } else if (pwFields.length > 3) {
@@ -1728,7 +1727,7 @@
       // checks) logins available, and there isn't a need to show
       // the insecure form warning.
       if (
-        foundLogins.length == 0 &&
+        !foundLogins.length &&
         (InsecurePasswordUtils.isFormSecure(form) ||
           !LoginHelper.showInsecureFieldWarning)
       ) {
@@ -1831,7 +1830,7 @@
       // Nothing to do if we have no matching logins available.
       // Only insecure pages reach this block and logs the same
       // telemetry flag.
-      if (foundLogins.length == 0) {
+      if (!foundLogins.length) {
         // We don't log() here since this is a very common case.
         autofillResult = AUTOFILL_RESULT.NO_SAVED_LOGINS;
         return;
@@ -1874,7 +1873,7 @@
         return fit;
       }, this);
 
-      if (logins.length == 0) {
+      if (!logins.length) {
         log("form not filled, none of the logins fit in the field");
         autofillResult = AUTOFILL_RESULT.NO_LOGINS_FIT;
         return;
@@ -1915,7 +1914,7 @@
         let matchingLogins = logins.filter(
           l => l.username.toLowerCase() == username
         );
-        if (matchingLogins.length == 0) {
+        if (!matchingLogins.length) {
           log(
             "Password not filled. None of the stored logins match the username already present."
           );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginManager.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginManager.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginManager.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginManager.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -255,7 +255,7 @@
    */
   _checkLogin(login) {
     // Sanity check the login
-    if (login.origin == null || login.origin.length == 0) {
+    if (login.origin == null || !login.origin.length) {
       throw new Error("Can't add a login with a null or empty origin.");
     }
 
@@ -264,7 +264,7 @@
       throw new Error("Can't add a login with a null username.");
     }
 
-    if (login.password == null || login.password.length == 0) {
+    if (login.password == null || !login.password.length) {
       throw new Error("Can't add a login with a null or empty password.");
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginManagerParent.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginManagerParent.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginManagerParent.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginManagerParent.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -611,7 +611,7 @@
     // If we didn't find a username field, but seem to be changing a
     // password, allow the user to select from a list of applicable
     // logins to update the password for.
-    if (!usernameField && oldPasswordField && logins.length > 0) {
+    if (!usernameField && oldPasswordField && logins.length) {
       let prompter = this._getPrompter(browser, openerTopWindowID);
 
       if (logins.length == 1) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginManagerPrompter.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginManagerPrompter.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginManagerPrompter.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginManagerPrompter.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -450,7 +450,7 @@
 
       // XXX Like the original code, we can't deal with multiple
       // account selection. (bug 227632)
-      if (foundLogins.length > 0) {
+      if (foundLogins.length) {
         selectedLogin = foundLogins[0];
 
         // If the caller provided a username, try to use it. If they
@@ -687,7 +687,7 @@
       this.log(foundLogins.length, "matching logins remain after deduping");
 
       // XXX Can't select from multiple accounts yet. (bug 227632)
-      if (foundLogins.length > 0) {
+      if (foundLogins.length) {
         selectedLogin = foundLogins[0];
         this._SetAuthInfo(
           aAuthInfo,
@@ -1035,7 +1035,7 @@
     let updateButtonStatus = element => {
       let mainActionButton = element.button;
       // Disable the main button inside the menu-button if the password field is empty.
-      if (login.password.length == 0) {
+      if (!login.password.length) {
         mainActionButton.setAttribute("disabled", true);
         chromeDoc
           .getElementById("password-notification-password")
@@ -1064,7 +1064,7 @@
         foundLogins,
         autoSavedLoginGuid
       );
-      let msgNames = logins.length == 0 ? saveMsgNames : changeMsgNames;
+      let msgNames = !logins.length ? saveMsgNames : changeMsgNames;
 
       // Update the label based on whether this will be a new login or not.
       let label = this._getLocalizedString(msgNames.buttonLabel);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginRecipes.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginRecipes.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/LoginRecipes.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/LoginRecipes.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -151,7 +151,7 @@
     log.debug("Adding recipe:", recipe);
     let recipeKeys = Object.keys(recipe);
     let unknownKeys = recipeKeys.filter(key => !SUPPORTED_KEYS.includes(key));
-    if (unknownKeys.length > 0) {
+    if (unknownKeys.length) {
       throw new Error(
         "The following recipe keys aren't supported: " + unknownKeys.join(", ")
       );
@@ -160,7 +160,7 @@
     let missingRequiredKeys = REQUIRED_KEYS.filter(
       key => !recipeKeys.includes(key)
     );
-    if (missingRequiredKeys.length > 0) {
+    if (missingRequiredKeys.length) {
       throw new Error(
         "The following required recipe keys are missing: " +
           missingRequiredKeys.join(", ")
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/test/browser/head.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/test/browser/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/test/browser/head.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/test/browser/head.js	2019-09-15 11:33:31.000000000 +0000
@@ -301,7 +301,7 @@
 
 function getDoorhangerButton(aPopup, aButtonIndex) {
   let notifications = aPopup.owner.panel.children;
-  ok(notifications.length > 0, "at least one notification displayed");
+  ok(!!notifications.length, "at least one notification displayed");
   ok(true, notifications.length + " notification(s)");
   let notification = notifications[0];
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/test/mochitest/pwmgr_common.js	2019-09-15 11:33:30.000000000 +0000
@@ -480,7 +480,7 @@
     let chromeWin = Services.wm.getMostRecentWindow("navigator:browser");
     if (chromeWin && chromeWin.PopupNotifications) {
       let notes = chromeWin.PopupNotifications._currentNotifications;
-      if (notes.length > 0) {
+      if (notes.length) {
         dump("Removing " + notes.length + " popup notifications.\n");
       }
       for (let note of notes) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/test/mochitest/pwmgr_common_parent.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/test/mochitest/pwmgr_common_parent.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/test/mochitest/pwmgr_common_parent.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/test/mochitest/pwmgr_common_parent.js	2019-09-15 11:33:30.000000000 +0000
@@ -197,7 +197,7 @@
     rv = LoginHelper.loginToVanillaObject(rv);
   } else if (
     Array.isArray(rv) &&
-    rv.length > 0 &&
+    !!rv.length &&
     rv[0] instanceof Ci.nsILoginInfo
   ) {
     rv = rv.map(login => LoginHelper.loginToVanillaObject(login));
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/test/mochitest/test_bug_627616.html	2019-09-15 11:33:30.000000000 +0000
@@ -58,7 +58,7 @@
       mm.sendAsyncMessage("prepareForNextTest");
       mm.addMessageListener("prepareForNextTestDone", function prepared(msg) {
         mm.removeMessageListener("prepareForNextTestDone", prepared);
-        if (pendingTests.length > 0) {
+        if (pendingTests.length) {
           ({expectedDialogs: gExpectedDialogs,
             test: gCurrentTest} = pendingTests.shift());
           gCurrentTest.call(this);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/passwordmgr/test/unit/test_login_autocomplete_result.js	2019-09-15 11:33:30.000000000 +0000
@@ -1172,7 +1172,7 @@
       }
     });
 
-    if (pattern.items.length != 0) {
+    if (pattern.items.length) {
       Assert.throws(
         () => actual.getValueAt(pattern.items.length),
         /Index out of range\./
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/pictureinpicture/tests/browser.ini firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/pictureinpicture/tests/browser.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/pictureinpicture/tests/browser.ini	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/pictureinpicture/tests/browser.ini	2019-09-15 11:33:30.000000000 +0000
@@ -3,8 +3,9 @@
   click-event-helper.js
   head.js
   test-button-overlay.html
-  test-page.html
   test-opaque-overlay.html
+  test-page.html
+  test-pointer-events-none.html
   test-transparent-overlay-1.html
   test-transparent-overlay-2.html
   test-video.mp4
@@ -29,6 +30,7 @@
 [browser_toggleOnInsertedVideo.js]
 [browser_toggleOpaqueOverlay.js]
 skip-if = true # Bug 1546455
+[browser_togglePointerEventsNone.js]
 [browser_toggleSimple.js]
 skip-if = os == 'linux' # Bug 1546455
 [browser_toggleTransparentOverlay-1.js]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/pictureinpicture/tests/browser_togglePointerEventsNone.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/pictureinpicture/tests/browser_togglePointerEventsNone.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/pictureinpicture/tests/browser_togglePointerEventsNone.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/pictureinpicture/tests/browser_togglePointerEventsNone.js	2019-09-15 11:33:30.000000000 +0000
@@ -0,0 +1,16 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+"use strict";
+
+/**
+ * Tests that the Picture-in-Picture toggle is clickable even if the
+ * video element has pointer-events: none.
+ */
+add_task(async () => {
+  const PAGE = TEST_ROOT + "test-pointer-events-none.html";
+  await testToggle(PAGE, {
+    "with-controls": { canToggle: true },
+    "no-controls": { canToggle: true },
+  });
+});
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/pictureinpicture/tests/test-pointer-events-none.html firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/pictureinpicture/tests/test-pointer-events-none.html
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/pictureinpicture/tests/test-pointer-events-none.html	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/pictureinpicture/tests/test-pointer-events-none.html	2019-09-15 11:33:31.000000000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Picture-in-Picture test - pointer-events: none</title>
+  <script type="text/javascript" src="click-event-helper.js"></script>
+</head>
+<style>
+  video {
+    display: block;
+    pointer-events: none;
+  }
+
+</style>
+<body>
+  <h1>Video with controls</h1>
+  <video id="with-controls" src="test-video.mp4" controls loop="true"></video>
+  <h1>Video without controls</h1>
+  <video id="no-controls" src="test-video.mp4" loop="true"></video>
+</body>
+</html>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/BookmarkHTMLUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/BookmarkHTMLUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/BookmarkHTMLUtils.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/BookmarkHTMLUtils.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -572,8 +572,7 @@
         .split(",")
         .filter(
           aTag =>
-            aTag.length > 0 &&
-            aTag.length <= PlacesUtils.bookmarks.MAX_TAG_LENGTH
+            !!aTag.length && aTag.length <= PlacesUtils.bookmarks.MAX_TAG_LENGTH
         );
 
       // If we end up with none, then delete the property completely.
@@ -864,7 +863,7 @@
 
   for (let key of ["toolbarFolder", "unfiledBookmarksFolder"]) {
     let root = rootsMap.get(key);
-    if (root.children && root.children.length > 0) {
+    if (root.children && root.children.length) {
       if (!this._root.children) {
         this._root.children = [];
       }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/BookmarkJSONUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/BookmarkJSONUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/BookmarkJSONUtils.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/BookmarkJSONUtils.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -249,11 +249,7 @@
       PlacesUtils.TYPE_X_MOZ_PLACE_CONTAINER
     );
 
-    if (
-      nodes.length == 0 ||
-      !nodes[0].children ||
-      nodes[0].children.length == 0
-    ) {
+    if (!nodes.length || !nodes[0].children || !nodes[0].children.length) {
       return;
     }
 
@@ -276,7 +272,7 @@
     // match what we need for insertTree, and we also have mappings of folders
     // so we can repair any searches after inserting the bookmarks (see bug 824502).
     for (let node of nodes) {
-      if (!node.children || node.children.length == 0) {
+      if (!node.children || !node.children.length) {
         continue;
       } // Nothing to restore for this root
 
@@ -292,7 +288,7 @@
     // Now we can add the actual nodes to the database.
     for (let node of nodes) {
       // Drop any nodes without children, we can't insert them.
-      if (!node.children || node.children.length == 0) {
+      if (!node.children || !node.children.length) {
         continue;
       }
 
@@ -478,7 +474,7 @@
       .split(",")
       .filter(
         aTag =>
-          aTag.length > 0 && aTag.length <= PlacesUtils.bookmarks.MAX_TAG_LENGTH
+          !!aTag.length && aTag.length <= PlacesUtils.bookmarks.MAX_TAG_LENGTH
       );
 
     // If we end up with none, then delete the property completely.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/History.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/History.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/History.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/History.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -355,7 +355,7 @@
   remove(pages, onResult = null) {
     // Normalize and type-check arguments
     if (Array.isArray(pages)) {
-      if (pages.length == 0) {
+      if (!pages.length) {
         throw new TypeError("Expected at least one page");
       }
     } else {
@@ -847,7 +847,7 @@
  * @returns {Promise} resolved when done
  */
 var invalidateFrecencies = async function(db, idList) {
-  if (idList.length == 0) {
+  if (!idList.length) {
     return;
   }
   await db.execute(
@@ -946,7 +946,7 @@
   );
 
   let pagesToRemove = pages.filter(p => !p.hasForeign && !p.hasVisits);
-  if (pagesToRemove.length == 0) {
+  if (!pagesToRemove.length) {
     return;
   }
 
@@ -1273,7 +1273,7 @@
   );
 
   try {
-    if (visitsToRemove.length == 0) {
+    if (!visitsToRemove.length) {
       // Nothing to do
       return false;
     }
@@ -1320,7 +1320,7 @@
     PlacesUtils.history.clearEmbedVisits();
   }
 
-  return visitsToRemove.length != 0;
+  return !!visitsToRemove.length;
 };
 
 // Inner implementation of History.removeByFilter
@@ -1472,7 +1472,7 @@
   });
 
   try {
-    if (pages.length == 0) {
+    if (!pages.length) {
       // Nothing to do
       return false;
     }
@@ -1626,7 +1626,7 @@
       ? pageInfo.previewImageURL.href
       : null;
   }
-  if (updateFragments.length > 0) {
+  if (updateFragments.length) {
     // Since this data may be written at every visit and is textual, avoid
     // overwriting the existing record if it didn't change.
     await db.execute(
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/PlacesSyncUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/PlacesSyncUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/PlacesSyncUtils.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/PlacesSyncUtils.jsm	2019-09-15 11:33:29.000000000 +0000
@@ -343,7 +343,7 @@
         WHERE url_hash = hash(:page_url) AND url = :page_url`,
       { page_url: canonicalURL.href }
     );
-    if (rows.length == 0) {
+    if (!rows.length) {
       return null;
     }
     return rows[0].getResultByName("guid");
@@ -1483,7 +1483,7 @@
       db,
       PlacesUtils.bookmarks.mobileGuid
     );
-    let hasMobileBookmarks = mobileChildGuids.length > 0;
+    let hasMobileBookmarks = !!mobileChildGuids.length;
 
     Services.prefs.setBoolPref(MOBILE_BOOKMARKS_PREF, hasMobileBookmarks);
   },
@@ -2022,11 +2022,11 @@
   // tag IDs, we temporarily tag a dummy URI, ensuring the tags exist.
   let dummyURI = PlacesUtils.toURI("about:weave#BStore_tagURI");
   let bookmarkURI = PlacesUtils.toURI(item.url.href);
-  if (newTags && newTags.length > 0) {
+  if (newTags && newTags.length) {
     PlacesUtils.tagging.tagURI(dummyURI, newTags, SOURCE_SYNC);
   }
   PlacesUtils.tagging.untagURI(bookmarkURI, null, SOURCE_SYNC);
-  if (newTags && newTags.length > 0) {
+  if (newTags && newTags.length) {
     PlacesUtils.tagging.tagURI(bookmarkURI, newTags, SOURCE_SYNC);
   }
   PlacesUtils.tagging.untagURI(dummyURI, null, SOURCE_SYNC);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/PlacesTransactions.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/PlacesTransactions.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/PlacesTransactions.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/PlacesTransactions.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -265,7 +265,7 @@
       throw new Error("aProxifiedTransaction is not a proxified transaction");
     }
 
-    if (this.length == 0 || forceNewEntry) {
+    if (!this.length || forceNewEntry) {
       this.clearRedoEntries();
       this.unshift([proxifiedTransaction]);
     } else {
@@ -296,7 +296,7 @@
    * Clear all entries.
    */
   clearAllEntries() {
-    if (this.length > 0) {
+    if (this.length) {
       this.splice(0);
       this._undoPosition = 0;
     }
@@ -315,7 +315,7 @@
    */
   batch(transactionsToBatch) {
     if (Array.isArray(transactionsToBatch)) {
-      if (transactionsToBatch.length == 0) {
+      if (!transactionsToBatch.length) {
         throw new Error("Must pass a non-empty array");
       }
 
@@ -725,7 +725,7 @@
       return new ctor(input);
     }
 
-    if (requiredProps.length > 0 || optionalProps.length > 0) {
+    if (requiredProps.length || optionalProps.length) {
       // Bind the input properties to the arguments of execute.
       input = DefineTransaction.verifyInput(
         input,
@@ -858,7 +858,7 @@
                           ${basePropertyName} as  input properties`);
         }
         let array = this.validateValue(input[name]);
-        if (required && array.length == 0) {
+        if (required && !array.length) {
           throw new Error(`Empty array passed for required input property:
                            ${name}`);
         }
@@ -896,7 +896,7 @@
   // * a single optional property with no required properties.
   if (
     requiredProps.length > 1 ||
-    (requiredProps.length == 0 && optionalProps.length > 1)
+    (!requiredProps.length && optionalProps.length > 1)
   ) {
     throw new Error("Transaction input isn't an object");
   }
@@ -915,7 +915,7 @@
   requiredProps = [],
   optionalProps = []
 ) {
-  if (requiredProps.length == 0 && optionalProps.length == 0) {
+  if (!requiredProps.length && !optionalProps.length) {
     return {};
   }
 
@@ -1092,7 +1092,7 @@
   async execute({ parentGuid, url, index, title, tags }) {
     let info = { parentGuid, index, url, title };
     // Filter tags to exclude already existing ones.
-    if (tags.length > 0) {
+    if (tags.length) {
       let currentTags = PlacesUtils.tagging.getTagsForURI(
         Services.io.newURI(url.href)
       );
@@ -1101,7 +1101,7 @@
 
     async function createItem() {
       info = await PlacesUtils.bookmarks.insert(info);
-      if (tags.length > 0) {
+      if (tags.length) {
         PlacesUtils.tagging.tagURI(Services.io.newURI(url.href), tags);
       }
     }
@@ -1111,7 +1111,7 @@
     this.undo = async function() {
       // Pick up the removed info so we have the accurate last-modified value.
       await PlacesUtils.bookmarks.remove(info);
-      if (tags.length > 0) {
+      if (tags.length) {
         PlacesUtils.tagging.untagURI(Services.io.newURI(url.href), tags);
       }
     };
@@ -1151,7 +1151,7 @@
       guid: parentGuid,
     };
 
-    if (children && children.length > 0) {
+    if (children && children.length) {
       // Ensure to specify a guid for each child to be restored on redo.
       info.children[0].children = children.map(c => {
         c.guid = PlacesUtils.history.makeGuid();
@@ -1302,7 +1302,7 @@
     async function updateItem() {
       updatedInfo = await PlacesUtils.bookmarks.update(updatedInfo);
       // Move tags from the original URI to the new URI.
-      if (originalTags.length > 0) {
+      if (originalTags.length) {
         // Untag the original URI only if this was the only bookmark.
         if (!(await PlacesUtils.bookmarks.fetch({ url: originalInfo.url }))) {
           PlacesUtils.tagging.untagURI(originalURI, originalTags);
@@ -1311,7 +1311,7 @@
         newURIAdditionalTags = originalTags.filter(
           t => !currentNewURITags.includes(t)
         );
-        if (newURIAdditionalTags && newURIAdditionalTags.length > 0) {
+        if (newURIAdditionalTags && newURIAdditionalTags.length) {
           PlacesUtils.tagging.tagURI(uri, newURIAdditionalTags);
         }
       }
@@ -1321,11 +1321,11 @@
     this.undo = async function() {
       await PlacesUtils.bookmarks.update(originalInfo);
       // Move tags from new URI to original URI.
-      if (originalTags.length > 0) {
+      if (originalTags.length) {
         // Only untag the new URI if this is the only bookmark.
         if (
           newURIAdditionalTags &&
-          newURIAdditionalTags.length > 0 &&
+          !!newURIAdditionalTags.length &&
           !(await PlacesUtils.bookmarks.fetch({ url }))
         ) {
           PlacesUtils.tagging.untagURI(uri, newURIAdditionalTags);
@@ -1416,7 +1416,7 @@
       let node = root.getChild(i);
       oldOrderGuids.push(node.bookmarkGuid);
       if (PlacesUtils.nodeIsSeparator(node)) {
-        if (preSepNodes.length > 0) {
+        if (preSepNodes.length) {
           preSepNodes.sort(sortingMethod);
           newOrderGuids.push(...preSepNodes.map(n => n.bookmarkGuid));
           preSepNodes = [];
@@ -1427,7 +1427,7 @@
       }
     }
     root.containerOpen = false;
-    if (preSepNodes.length > 0) {
+    if (preSepNodes.length) {
       preSepNodes.sort(sortingMethod);
       newOrderGuids.push(...preSepNodes.map(n => n.bookmarkGuid));
     }
@@ -1558,21 +1558,21 @@
       let uri = Services.io.newURI(url.href);
       let tagsToRemove;
       let tagsSet = PlacesUtils.tagging.getTagsForURI(uri);
-      if (tags.length > 0) {
+      if (tags.length) {
         tagsToRemove = tags.filter(t => tagsSet.includes(t));
       } else {
         tagsToRemove = tagsSet;
       }
-      if (tagsToRemove.length > 0) {
+      if (tagsToRemove.length) {
         PlacesUtils.tagging.untagURI(uri, tagsToRemove);
       }
       onUndo.unshift(() => {
-        if (tagsToRemove.length > 0) {
+        if (tagsToRemove.length) {
           PlacesUtils.tagging.tagURI(uri, tagsToRemove);
         }
       });
       onRedo.push(() => {
-        if (tagsToRemove.length > 0) {
+        if (tagsToRemove.length) {
           PlacesUtils.tagging.untagURI(uri, tagsToRemove);
         }
       });
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/PlacesUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/PlacesUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/PlacesUtils.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/PlacesUtils.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -856,7 +856,7 @@
   _shutdownFunctions: [],
   registerShutdownFunction: function PU_registerShutdownFunction(aFunc) {
     // If this is the first registered function, add the shutdown observer.
-    if (this._shutdownFunctions.length == 0) {
+    if (!this._shutdownFunctions.length) {
       Services.obs.addObserver(this, this.TOPIC_SHUTDOWN);
     }
     this._shutdownFunctions.push(aFunc);
@@ -867,7 +867,7 @@
     switch (aTopic) {
       case this.TOPIC_SHUTDOWN:
         Services.obs.removeObserver(this, this.TOPIC_SHUTDOWN);
-        while (this._shutdownFunctions.length > 0) {
+        while (this._shutdownFunctions.length) {
           this._shutdownFunctions.shift().apply(this);
         }
         break;
@@ -2824,7 +2824,7 @@
           "SELECT b.id, b.guid from moz_bookmarks b WHERE b.guid = :guid LIMIT 1",
           { guid: aGuid }
         );
-        if (rows.length == 0) {
+        if (!rows.length) {
           throw new Error("no item found for the given GUID");
         }
 
@@ -2879,7 +2879,7 @@
           "SELECT b.id, b.guid from moz_bookmarks b WHERE b.id = :id LIMIT 1",
           { id: aItemId }
         );
-        if (rows.length == 0) {
+        if (!rows.length) {
           throw new Error("no item found for the given itemId");
         }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/TaggingService.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/TaggingService.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/TaggingService.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/TaggingService.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -131,7 +131,7 @@
           tag.__defineGetter__("name", () => this._tagFolders[tag.id]);
         } else if (
           typeof idOrName == "string" &&
-          idOrName.length > 0 &&
+          !!idOrName.length &&
           idOrName.length <= PlacesUtils.bookmarks.MAX_TAG_LENGTH
         ) {
           // This is a tag name.
@@ -151,7 +151,7 @@
 
   // nsITaggingService
   tagURI: function TS_tagURI(aURI, aTags, aSource) {
-    if (!aURI || !aTags || !Array.isArray(aTags) || aTags.length == 0) {
+    if (!aURI || !aTags || !Array.isArray(aTags) || !aTags.length) {
       throw Components.Exception(
         "Invalid value for tags",
         Cr.NS_ERROR_INVALID_ARG
@@ -230,7 +230,7 @@
 
   // nsITaggingService
   untagURI: function TS_untagURI(aURI, aTags, aSource) {
-    if (!aURI || (aTags && (!Array.isArray(aTags) || aTags.length == 0))) {
+    if (!aURI || (aTags && (!Array.isArray(aTags) || !aTags.length))) {
       throw Components.Exception(
         "Invalid value for tags",
         Cr.NS_ERROR_INVALID_ARG
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/favicons/test_root_icons.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/favicons/test_root_icons.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/favicons/test_root_icons.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/favicons/test_root_icons.js	2019-09-15 11:33:31.000000000 +0000
@@ -131,7 +131,7 @@
   await PlacesTestUtils.promiseAsyncUpdates();
   rows = await db.execute("SELECT * FROM moz_icons");
   // Debug logging for possible intermittent failure (bug 1358368).
-  if (rows.length != 0) {
+  if (rows.length) {
     dump_table("moz_icons");
   }
   Assert.equal(rows.length, 0, "There should be no icon entry");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/head_common.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/head_common.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/head_common.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/head_common.js	2019-09-15 11:33:30.000000000 +0000
@@ -707,8 +707,8 @@
     return a1.every((e, i) => e == a2[i]);
   }
   return (
-    a1.filter(e => !a2.includes(e)).length == 0 &&
-    a2.filter(e => !a1.includes(e)).length == 0
+    !a1.filter(e => !a2.includes(e)).length &&
+    !a2.filter(e => !a1.includes(e)).length
   );
 }
 
@@ -804,7 +804,7 @@
     `,
     { url }
   );
-  return rows.length == 0 ? 0 : rows[0].getResultByName("foreign_count");
+  return !rows.length ? 0 : rows[0].getResultByName("foreign_count");
 }
 
 function compareAscending(a, b) {
@@ -906,9 +906,9 @@
   }
 
   let data1 = await getIconData(icon1);
-  Assert.ok(data1.length > 0, "Should fetch icon data");
+  Assert.ok(!!data1.length, "Should fetch icon data");
   let data2 = await getIconData(icon2);
-  Assert.ok(data2.length > 0, "Should fetch icon data");
+  Assert.ok(!!data2.length, "Should fetch icon data");
   Assert.deepEqual(data1, data2, msg);
 }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/history/test_async_history_api.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/history/test_async_history_api.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/history/test_async_history_api.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/history/test_async_history_api.js	2019-09-15 11:33:31.000000000 +0000
@@ -376,7 +376,7 @@
   });
 
   let placesResult = await promiseUpdatePlaces(places);
-  if (placesResult.results.length > 0) {
+  if (placesResult.results.length) {
     do_throw("Unexpected success.");
   }
   for (let place of placesResult.errors) {
@@ -397,7 +397,7 @@
 
   Assert.equal(false, await PlacesUtils.history.hasVisits(place.uri));
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   let placeInfo = placesResult.results[0];
@@ -411,7 +411,7 @@
 
   Assert.equal(false, await PlacesUtils.history.hasVisits(badPlace.uri));
   placesResult = await promiseUpdatePlaces(badPlace);
-  if (placesResult.results.length > 0) {
+  if (placesResult.results.length) {
     do_throw("Unexpected success.");
   }
   let badPlaceInfo = placesResult.errors[0];
@@ -439,7 +439,7 @@
   );
 
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   let placeInfo = placesResult.results[0];
@@ -474,7 +474,7 @@
   Assert.equal(false, await PlacesUtils.history.hasVisits(place.uri));
 
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   let placeInfo = placesResult.results[0];
@@ -508,7 +508,7 @@
   // as being invalid.
   Assert.equal(false, await PlacesUtils.history.hasVisits(referrerPlace.uri));
   let placesResult = await promiseUpdatePlaces(referrerPlace);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
 
@@ -526,7 +526,7 @@
 
   Assert.equal(false, await PlacesUtils.history.hasVisits(place.uri));
   placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   let placeInfo = placesResult.results[0];
@@ -558,7 +558,7 @@
 
   Assert.equal(false, await PlacesUtils.history.hasVisits(place.uri));
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   let placeInfo = placesResult.results[0];
@@ -575,7 +575,7 @@
 
   Assert.equal(false, await PlacesUtils.history.hasVisits(badPlace.uri));
   placesResult = await promiseUpdatePlaces(badPlace);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   placeInfo = placesResult.results[0];
@@ -631,7 +631,7 @@
 
   let callbackCount = 0;
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   for (let placeInfo of placesResult.results) {
@@ -698,7 +698,7 @@
 
   let callbackCount = 0;
   let placesResult = await promiseUpdatePlaces(places);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   for (let placeInfo of placesResult.results) {
@@ -774,7 +774,7 @@
   Assert.equal(false, await PlacesUtils.history.hasVisits(place.uri));
 
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   let placeInfo = placesResult.results[0];
@@ -802,7 +802,7 @@
 
   let resultCount = 0;
   let placesResult = await promiseUpdatePlaces(places);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   for (let placeInfo of placesResult.results) {
@@ -846,14 +846,14 @@
   Assert.equal(false, await PlacesUtils.history.hasVisits(place.uri));
 
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   // Then, change the guid with visits.
   place.guid = "_GUIDCHANGE_";
   place.visits = [new VisitInfo()];
   placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   do_check_guid_for_uri(place.uri, place.guid);
@@ -871,7 +871,7 @@
   Assert.equal(false, await PlacesUtils.history.hasVisits(place.uri));
 
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
 
@@ -879,7 +879,7 @@
   place.title = "";
   place.visits = [new VisitInfo()];
   placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   do_check_title_for_uri(place.uri, null);
@@ -888,7 +888,7 @@
   place.title = "title change";
   place.visits = [new VisitInfo()];
   placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   do_check_title_for_uri(place.uri, place.title);
@@ -897,7 +897,7 @@
   place.title = null;
   place.visits = [new VisitInfo()];
   placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   do_check_title_for_uri(place.uri, place.title);
@@ -916,14 +916,14 @@
   Assert.equal(false, await PlacesUtils.history.hasVisits(place.uri));
 
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   // Now, make sure that not specifying a title does not clear it.
   delete place.title;
   place.visits = [new VisitInfo()];
   placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   do_check_title_for_uri(place.uri, TITLE);
@@ -950,7 +950,7 @@
 
   PlacesUtils.history.addObserver(silentObserver);
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
 
@@ -1167,7 +1167,7 @@
 
   Assert.equal(false, await PlacesUtils.history.hasVisits(place.uri));
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   let placeInfo = placesResult.results[0];
@@ -1181,7 +1181,7 @@
 
   Assert.equal(false, await PlacesUtils.history.hasVisits(badPlace.uri));
   placesResult = await promiseUpdatePlaces(badPlace, { ignoreErrors: true });
-  if (placesResult.results.length > 0) {
+  if (placesResult.results.length) {
     do_throw("Unexpected success.");
   }
   Assert.equal(
@@ -1239,7 +1239,7 @@
 
   Assert.equal(false, await PlacesUtils.history.hasVisits(place.uri));
   let placesResult = await promiseUpdatePlaces(place);
-  if (placesResult.errors.length > 0) {
+  if (placesResult.errors.length) {
     do_throw("Unexpected error.");
   }
   let placeInfo = placesResult.results[0];
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/history/test_update.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/history/test_update.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/history/test_update.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/history/test_update.js	2019-09-15 11:33:30.000000000 +0000
@@ -165,7 +165,7 @@
   await PlacesUtils.history.update({ url: TEST_URL, description });
   descriptionInDB = await PlacesTestUtils.fieldInDB(TEST_URL, "description");
   Assert.ok(
-    0 < descriptionInDB.length < description.length,
+    !!descriptionInDB.length < description.length,
     "a long description should be truncated"
   );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/PlacesTestUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/PlacesTestUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/PlacesTestUtils.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/PlacesTestUtils.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -198,7 +198,7 @@
       "SELECT id FROM moz_places WHERE url_hash = hash(:url) AND url = :url",
       { url }
     );
-    return rows.length > 0;
+    return !!rows.length;
   },
 
   /**
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/queries/test_redirects.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/queries/test_redirects.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/queries/test_redirects.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/queries/test_redirects.js	2019-09-15 11:33:31.000000000 +0000
@@ -50,9 +50,9 @@
     if (!includeHidden && isHidden(aVisit)) {
       // If the page has any non-hidden visit, then it's visible.
       if (
-        visits.filter(function(refVisit) {
+        !visits.filter(function(refVisit) {
           return refVisit.uri == aVisit.uri && !isHidden(refVisit);
-        }).length == 0
+        }).length
       ) {
         return false;
       }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/queries/test_results-as-visit.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/queries/test_results-as-visit.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/queries/test_results-as-visit.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/queries/test_results-as-visit.js	2019-09-15 11:33:29.000000000 +0000
@@ -20,7 +20,7 @@
         title: aPage.title,
         uri: aPage.uri,
         lastVisit: newTimeInMicroseconds(),
-        isTag: aPage.tags && aPage.tags.length > 0,
+        isTag: aPage.tags && !!aPage.tags.length,
         tagArray: aPage.tags,
       });
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/unit/test_async_transactions.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/unit/test_async_transactions.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/unit/test_async_transactions.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/unit/test_async_transactions.js	2019-09-15 11:33:30.000000000 +0000
@@ -1733,10 +1733,9 @@
     }
     function ensureTagsUnset() {
       for (let url of urls) {
-        let expectedTags =
-          tagsRemoved.length == 0
-            ? []
-            : preRemovalTags.get(url).filter(tag => !tagsRemoved.includes(tag));
+        let expectedTags = !tagsRemoved.length
+          ? []
+          : preRemovalTags.get(url).filter(tag => !tagsRemoved.includes(tag));
         ensureTagsForURI(url, expectedTags);
       }
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/unit/test_bookmarks_html.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/unit/test_bookmarks_html.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/unit/test_bookmarks_html.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/unit/test_bookmarks_html.js	2019-09-15 11:33:30.000000000 +0000
@@ -370,7 +370,7 @@
           let folder = aNode.QueryInterface(
             Ci.nsINavHistoryContainerResultNode
           );
-          Assert.equal(folder.hasChildren, aExpected.children.length > 0);
+          Assert.equal(folder.hasChildren, !!aExpected.children.length);
           folder.containerOpen = true;
           Assert.equal(folder.childCount, aExpected.children.length);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/unit/test_bookmarks_json.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/unit/test_bookmarks_json.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/unit/test_bookmarks_json.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/unit/test_bookmarks_json.js	2019-09-15 11:33:31.000000000 +0000
@@ -270,7 +270,7 @@
         break;
       case "children":
         let folder = aNode.QueryInterface(Ci.nsINavHistoryContainerResultNode);
-        Assert.equal(folder.hasChildren, aExpected.children.length > 0);
+        Assert.equal(folder.hasChildren, !!aExpected.children.length);
         folder.containerOpen = true;
         Assert.equal(folder.childCount, aExpected.children.length);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/unit/test_null_interfaces.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/unit/test_null_interfaces.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/unit/test_null_interfaces.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/unit/test_null_interfaces.js	2019-09-15 11:33:31.000000000 +0000
@@ -50,7 +50,7 @@
       let mesg = "";
       if (typeof func != "function") {
         mesg = "Not a function!";
-      } else if (func.length == 0) {
+      } else if (!func.length) {
         mesg = "No args needed!";
       } else if (name == "QueryInterface") {
         mesg = "Ignore QI!";
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/unit/test_promiseBookmarksTree.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/unit/test_promiseBookmarksTree.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/tests/unit/test_promiseBookmarksTree.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/tests/unit/test_promiseBookmarksTree.js	2019-09-15 11:33:30.000000000 +0000
@@ -76,7 +76,7 @@
         expectedChildrenNodes.push(childNode);
       }
 
-      if (expectedChildrenNodes.length > 0) {
+      if (expectedChildrenNodes.length) {
         Assert.ok(Array.isArray(aItem.children));
         Assert.equal(aItem.children.length, expectedChildrenNodes.length);
         for (let i = 0; i < aItem.children.length; i++) {
@@ -187,7 +187,7 @@
   aOptions,
   aExcludedGuids
 ) {
-  Assert.ok(aNode.bookmarkGuid && aNode.bookmarkGuid.length > 0);
+  Assert.ok(aNode.bookmarkGuid && !!aNode.bookmarkGuid.length);
   let item = await PlacesUtils.promiseBookmarksTree(
     aNode.bookmarkGuid,
     aOptions
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/UnifiedComplete.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/UnifiedComplete.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/places/UnifiedComplete.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/places/UnifiedComplete.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -647,7 +647,7 @@
 
   // This allows to handle leading or trailing restriction characters specially.
   this._leadingRestrictionToken = null;
-  if (tokens.length > 0) {
+  if (tokens.length) {
     if (
       UrlbarTokenizer.isRestrictionToken(tokens[0]) &&
       (tokens.length > 1 ||
@@ -672,7 +672,7 @@
   // keyword, a search engine alias, an extension keyword, or simply a URL or
   // part of the search string the user has typed.  We won't know until we
   // create the heuristic result.
-  let firstToken = this._searchTokens.length > 0 && this._searchTokens[0].value;
+  let firstToken = !!this._searchTokens.length && this._searchTokens[0].value;
   this._heuristicToken =
     firstToken && this._trimmedOriginalSearchString.startsWith(firstToken)
       ? firstToken
@@ -1339,7 +1339,7 @@
     // We always try to make the first result a special "heuristic" result.  The
     // heuristics below determine what type of result it will be, if any.
 
-    let hasSearchTerms = this._searchTokens.length > 0;
+    let hasSearchTerms = !!this._searchTokens.length;
 
     if (hasSearchTerms) {
       // It may be a keyword registered by an extension.
@@ -2042,7 +2042,7 @@
     // when searching for "Firefox".
     let terms = parseResult.terms.toLowerCase();
     if (
-      this._searchTokens.length > 0 &&
+      this._searchTokens.length &&
       this._searchTokens.every(token => !terms.includes(token.value))
     ) {
       return;
@@ -2209,7 +2209,7 @@
       // This requires walking the previous matches and marking their existence
       // into the current buckets, so that, when we'll add the new matches to
       // the buckets, we can either append or replace a match.
-      if (this._previousSearchMatchTypes.length > 0) {
+      if (this._previousSearchMatchTypes.length) {
         for (let type of this._previousSearchMatchTypes) {
           for (let bucket of this._buckets) {
             if (type == bucket.type && bucket.count < bucket.available) {
@@ -2254,7 +2254,7 @@
    *        Whether to notify a result change.
    */
   _cleanUpNonCurrentMatches(type, notify = true) {
-    if (this._previousSearchMatchTypes.length == 0 || !this.pending) {
+    if (!this._previousSearchMatchTypes.length || !this.pending) {
       return;
     }
 
@@ -2295,10 +2295,7 @@
    * If in restrict mode, cleanups non current matches for all the empty types.
    */
   cleanUpRestrictNonCurrentMatches() {
-    if (
-      this.hasBehavior("restrict") &&
-      this._previousSearchMatchTypes.length > 0
-    ) {
+    if (this.hasBehavior("restrict") && this._previousSearchMatchTypes.length) {
       for (let type of new Set(this._previousSearchMatchTypes)) {
         if (this._counts[type] == 0) {
           // Don't notify, since we are about to notify completion.
@@ -2613,7 +2610,7 @@
       return false;
     }
 
-    if (this._searchString.length == 0) {
+    if (!this._searchString.length) {
       return false;
     }
 
@@ -2903,8 +2900,8 @@
       // that may leave exposed unrelated matches for a longer time.
       let previousSearchString = result.searchString;
       let stringsRelated =
-        previousSearchString.length > 0 &&
-        searchString.length > 0 &&
+        !!previousSearchString.length &&
+        !!searchString.length &&
         (previousSearchString.includes(searchString) ||
           searchString.includes(previousSearchString));
       if (insertMethod == UrlbarUtils.INSERTMETHOD.MERGE || stringsRelated) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/promiseworker/PromiseWorker.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/promiseworker/PromiseWorker.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/promiseworker/PromiseWorker.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/promiseworker/PromiseWorker.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -42,7 +42,7 @@
     return this._array.push(x);
   },
   isEmpty: function isEmpty() {
-    return this._array.length == 0;
+    return !this._array.length;
   },
 };
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/satchel/FormAutoComplete.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/satchel/FormAutoComplete.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/satchel/FormAutoComplete.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/satchel/FormAutoComplete.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -627,13 +627,13 @@
   searchString: "",
   errorDescription: "",
   get defaultIndex() {
-    if (this.entries.length == 0) {
+    if (!this.entries.length) {
       return -1;
     }
     return 0;
   },
   get searchResult() {
-    if (this.entries.length == 0) {
+    if (!this.entries.length) {
       return Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
     }
     return Ci.nsIAutoCompleteResult.RESULT_SUCCESS;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/satchel/InputListAutoComplete.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/satchel/InputListAutoComplete.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/satchel/InputListAutoComplete.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/satchel/InputListAutoComplete.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -14,11 +14,10 @@
 
   autoCompleteSearch(aUntrimmedSearchString, aField) {
     let [values, labels] = this.getListSuggestions(aField);
-    let searchResult =
-      values.length > 0
-        ? Ci.nsIAutoCompleteResult.RESULT_SUCCESS
-        : Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
-    let defaultIndex = values.length > 0 ? 0 : -1;
+    let searchResult = values.length
+      ? Ci.nsIAutoCompleteResult.RESULT_SUCCESS
+      : Ci.nsIAutoCompleteResult.RESULT_NOMATCH;
+    let defaultIndex = values.length ? 0 : -1;
 
     return new FormAutoCompleteResult(
       aUntrimmedSearchString,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/satchel/test/satchel_common.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/satchel/test/satchel_common.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/satchel/test/satchel_common.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/satchel/test/satchel_common.js	2019-09-15 11:33:30.000000000 +0000
@@ -90,7 +90,7 @@
   },
 
   waitForChecks(callback) {
-    if (this.verifyStack.length == 0) {
+    if (!this.verifyStack.length) {
       callback();
     } else {
       this.callback = callback;
@@ -101,7 +101,7 @@
     if (data != "formhistory-add" && data != "formhistory-update") {
       return;
     }
-    ok(this.verifyStack.length > 0, "checking if saved form data was expected");
+    ok(!!this.verifyStack.length, "checking if saved form data was expected");
 
     // Make sure that every piece of data we expect to be saved is saved, and no
     // more. Here it is assumed that for every entry satchel saves or modifies, a
@@ -116,7 +116,7 @@
 
     countEntries(expected.name, expected.value, function(num) {
       ok(num > 0, expected.message);
-      if (checkObserver.verifyStack.length == 0) {
+      if (!checkObserver.verifyStack.length) {
         let callback = checkObserver.callback;
         checkObserver.callback = null;
         callback();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/satchel/test/unit/test_history_api.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/satchel/test/unit/test_history_api.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/satchel/test/unit/test_history_api.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/satchel/test/unit/test_history_api.js	2019-09-15 11:33:31.000000000 +0000
@@ -248,7 +248,7 @@
 
     let processFirstResult = function processResults(results) {
       // Only handle the first result
-      if (results.length > 0) {
+      if (results.length) {
         let result = results[0];
         return [
           result.timesUsed,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/docs/SearchEngineConfiguration.rst firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/docs/SearchEngineConfiguration.rst
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/docs/SearchEngineConfiguration.rst	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/docs/SearchEngineConfiguration.rst	2019-09-15 11:33:31.000000000 +0000
@@ -112,7 +112,7 @@
 Special Attributes
 ------------------
 
-If a ``webExtensionLocale`` attribute is specified with the value
+If a ``webExtensionLocales`` attribute contains an element with the value
 ``"$USER_LOCALE"`` then the special value will be replaced in the
 configuration object with the users locale. For example:
 
@@ -126,10 +126,10 @@
           "locales": {
             "matches": ["us", "gb"]
           },
-          "webExtensionLocale": "$USER_LOCALE",
+          "webExtensionLocales": ["$USER_LOCALE"],
         },
 
-Will report either ``us`` or ``gb`` as the ``webExtensionLocale``
+Will report either ``[us]`` or ``[gb]`` as the ``webExtensionLocales``
 depending on the user.
 
 Experiments
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/SearchEngine.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/SearchEngine.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/SearchEngine.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/SearchEngine.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -1639,7 +1639,7 @@
           break;
       }
     }
-    if (!this.name || this._urls.length == 0) {
+    if (!this.name || !this._urls.length) {
       SearchUtils.fail("_parse: No name, or missing URL!", Cr.NS_ERROR_FAILURE);
     }
     if (!this.supportsResponseType(SearchUtils.URL_TYPE.SEARCH)) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/SearchEngineSelector.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/SearchEngineSelector.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/SearchEngineSelector.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/SearchEngineSelector.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -84,8 +84,10 @@
           this._copyObject(baseConfig, section);
         }
 
-        if (baseConfig.webExtensionLocale == USER_LOCALE) {
-          baseConfig.webExtensionLocale = locale;
+        if ("webExtensionLocales" in baseConfig) {
+          baseConfig.webExtensionLocales = baseConfig.webExtensionLocales.map(
+            val => (val == USER_LOCALE ? locale : val)
+          );
         }
 
         engines.push(baseConfig);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/SearchService.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/SearchService.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/SearchService.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/SearchService.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -1151,12 +1151,10 @@
 
   async _loadEnginesFromConfig(engineConfigs) {
     for (let config of engineConfigs) {
-      // TODO: Support multiple locales per engine
-      // https://bugzilla.mozilla.org/show_bug.cgi?id=1575555
       SearchUtils.log("_loadEnginesFromConfig: " + JSON.stringify(config));
       let locales =
-        "webExtensionLocale" in config
-          ? [config.webExtensionLocale]
+        "webExtensionLocales" in config
+          ? config.webExtensionLocales
           : [DEFAULT_TAG];
       await this.ensureBuiltinExtension(config.webExtensionId, locales);
     }
@@ -1816,7 +1814,7 @@
         e => !ignoredJAREngines.includes(e)
       );
       // Don't allow all engines to be hidden
-      if (filteredEngineNames.length > 0) {
+      if (filteredEngineNames.length) {
         engineNames = filteredEngineNames;
       }
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/searchconfigs/head_searchconfig.js	2019-09-15 11:33:31.000000000 +0000
@@ -188,7 +188,13 @@
       code: config.searchUrlGetExtraCodes,
     };
 
-    let locale = config.webExtensionLocale || "default";
+    // Currently wikipedia is the only engine that uses multiple
+    // locales and that isn't a tested engine so for now pick
+    // the first (only) locale.
+    let locale =
+      "webExtensionLocales" in config
+        ? config.webExtensionLocales[0]
+        : "default";
     // On startup the extension may have not finished parsing the
     // manifest, wait for that here.
     await policy.readyPromise;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/test_engine_selector.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/test_engine_selector.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/test_engine_selector.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/test_engine_selector.js	2019-09-15 11:33:31.000000000 +0000
@@ -14,14 +14,14 @@
       {
         engineName: "aol",
         orderHint: 500,
-        webExtensionLocale: "default",
+        webExtensionLocales: ["default"],
         appliesTo: [
           {
             included: { everywhere: true },
           },
           {
             included: { regions: ["us"] },
-            webExtensionLocale: "$USER_LOCALE",
+            webExtensionLocales: ["$USER_LOCALE"],
           },
         ],
       },
@@ -82,9 +82,9 @@
   );
   let names = engines.map(obj => obj.engineName);
   Assert.deepEqual(names, ["lycos", "altavista", "aol"], "Correct order");
-  Assert.equal(
-    engines[2].webExtensionLocale,
-    "en-US",
+  Assert.deepEqual(
+    engines[2].webExtensionLocales,
+    ["en-US"],
     "Subsequent matches in applies to can override default"
   );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/test_notifications.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/test_notifications.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/test_notifications.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/test_notifications.js	2019-09-15 11:33:31.000000000 +0000
@@ -41,7 +41,7 @@
 
     this.expectedNotifications.shift();
 
-    if (this.expectedNotifications.length == 0) {
+    if (!this.expectedNotifications.length) {
       this.deferred.resolve(this.addedEngine);
       Services.obs.removeObserver(
         this.observer,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/test_SearchStaticData.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/test_SearchStaticData.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/test_SearchStaticData.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/test_SearchStaticData.js	2019-09-15 11:33:30.000000000 +0000
@@ -25,7 +25,7 @@
       d.startsWith("www.google.")
     )
   );
-  Assert.ok(SearchStaticData.getAlternateDomains("google.com").length == 0);
+  Assert.ok(!SearchStaticData.getAlternateDomains("google.com").length);
 
   // Test that methods from SearchStaticData module can be overwritten,
   // needed for hotfixing.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/test_searchSuggest.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/test_searchSuggest.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/test_searchSuggest.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/test_searchSuggest.js	2019-09-15 11:33:30.000000000 +0000
@@ -482,7 +482,7 @@
   let controller = new SearchSuggestionController();
   let result = await controller.fetch("", false, getEngine);
   Assert.equal(result.term, "");
-  Assert.ok(result.local.length > 0);
+  Assert.ok(!!result.local.length);
   Assert.equal(result.remote.length, 0);
 });
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/test_validate_manifests.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/test_validate_manifests.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/search/tests/xpcshell/test_validate_manifests.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/search/tests/xpcshell/test_validate_manifests.js	2019-09-15 11:33:31.000000000 +0000
@@ -43,7 +43,7 @@
 add_task(async function test_validate_manifest() {
   let searchExtensions = await getSearchExtensions();
   ok(
-    searchExtensions.length > 0,
+    !!searchExtensions.length,
     `Found ${searchExtensions.length} search extensions`
   );
   for (const xpi of searchExtensions) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/sessionstore/SessionStoreFunctions.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/sessionstore/SessionStoreFunctions.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/sessionstore/SessionStoreFunctions.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/sessionstore/SessionStoreFunctions.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -370,7 +370,7 @@
         data[aOrigins[i]] = hostData;
       }
     }
-    if (aOrigins.length > 0) {
+    if (aOrigins.length) {
       return data;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/app/TelemetrySend.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/app/TelemetrySend.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/app/TelemetrySend.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/app/TelemetrySend.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -511,7 +511,7 @@
       );
 
       // Bail out if there is nothing to send.
-      if (pending.length == 0 && current.length == 0) {
+      if (!pending.length && !current.length) {
         this._log.trace("_doSendTask - no pending pings, bailing out");
         this._sendTaskState = "bail out - no pings to send";
         return;
@@ -808,7 +808,7 @@
     // Scan the pending pings - that gives us a list sorted by last modified, descending.
     let infos = await TelemetryStorage.loadPendingPingList();
     this._log.info("_checkPendingPings - pending ping count: " + infos.length);
-    if (infos.length == 0) {
+    if (!infos.length) {
       this._log.trace("_checkPendingPings - no pending pings");
       return;
     }
@@ -1105,7 +1105,7 @@
       pingSends.push(p);
     }
 
-    if (persistedPingIds.length > 0) {
+    if (persistedPingIds.length) {
       pingSends.push(
         this._sendPersistedPings(persistedPingIds).catch(ex => {
           this._log.info("sendPings - persisted pings not sent", ex);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/pings/ModulesPing.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/pings/ModulesPing.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/pings/ModulesPing.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/pings/ModulesPing.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -80,7 +80,7 @@
     try {
       Telemetry.getLoadedModules().then(
         modules => {
-          modules = modules.filter(module => module.name.length > 0);
+          modules = modules.filter(module => !!module.name.length);
 
           // Cut the list of modules to MAX_MODULES_NUM entries.
           if (modules.length > MAX_MODULES_NUM) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/pings/TelemetrySession.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/pings/TelemetrySession.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/pings/TelemetrySession.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/pings/TelemetrySession.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -721,7 +721,7 @@
 
       if (
         this._slowSQLStartup &&
-        Object.keys(this._slowSQLStartup).length != 0 &&
+        !!Object.keys(this._slowSQLStartup).length &&
         (Object.keys(this._slowSQLStartup.mainThread).length ||
           Object.keys(this._slowSQLStartup.otherThreads).length)
       ) {
@@ -740,7 +740,7 @@
       // Adding captured stacks to the payload only if any exist and clearing
       // captures for this sub-session.
       let stacks = protect(() => Telemetry.snapshotCapturedStacks(true));
-      if (stacks && "captures" in stacks && stacks.captures.length > 0) {
+      if (stacks && "captures" in stacks && stacks.captures.length) {
         payloadObj.processes.parent.capturedStacks = stacks;
       }
     }
@@ -1107,7 +1107,7 @@
     reason = reason || REASON_GATHER_PAYLOAD;
     // This function returns the current Telemetry payload to the caller.
     // We only gather startup info once.
-    if (Object.keys(this._slowSQLStartup).length == 0) {
+    if (!Object.keys(this._slowSQLStartup).length) {
       this._slowSQLStartup = Telemetry.slowSQL;
     }
     Services.telemetry.gatherMemory();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/tests/browser/browser_HybridContentTelemetry.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/tests/browser/browser_HybridContentTelemetry.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/tests/browser/browser_HybridContentTelemetry.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/tests/browser/browser_HybridContentTelemetry.js	2019-09-15 11:33:30.000000000 +0000
@@ -44,7 +44,7 @@
 async function waitForEvent(aProcess, aEventData) {
   await waitForProcessesEvents([aProcess], events => {
     let processEvents = events[aProcess].map(e => e.slice(1));
-    if (processEvents.length == 0) {
+    if (!processEvents.length) {
       return false;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/tests/browser/browser_TelemetryGC.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/tests/browser/browser_TelemetryGC.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/tests/browser/browser_TelemetryGC.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/tests/browser/browser_TelemetryGC.js	2019-09-15 11:33:31.000000000 +0000
@@ -51,7 +51,7 @@
 
       ok("slices_list" in gc, "slices_list field present");
       ok(Array.isArray(gc.slices_list), "slices_list is an array");
-      ok(gc.slices_list.length > 0, "slices_list array non-empty");
+      ok(!!gc.slices_list.length, "slices_list array non-empty");
       ok(gc.slices_list.length <= 4, "slices_list array is not too long");
 
       ok("totals" in gc, "totals field present");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/tests/unit/test_ChildEvents.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/tests/unit/test_ChildEvents.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/tests/unit/test_ChildEvents.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/tests/unit/test_ChildEvents.js	2019-09-15 11:33:30.000000000 +0000
@@ -128,17 +128,17 @@
 
   Assert.ok("parent" in snapshot, "Should have main process section");
   Assert.ok(
-    snapshot.parent.length > 0,
+    !!snapshot.parent.length,
     "Main process section should have events."
   );
   Assert.ok("content" in snapshot, "Should have child process section");
   Assert.ok(
-    snapshot.content.length > 0,
+    !!snapshot.content.length,
     "Child process section should have events."
   );
   Assert.ok("dynamic" in snapshot, "Should have dynamic process section");
   Assert.ok(
-    snapshot.dynamic.length > 0,
+    !!snapshot.dynamic.length,
     "Dynamic process section should have events."
   );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/tests/unit/test_TelemetryEnvironment.js	2019-09-15 11:33:31.000000000 +0000
@@ -739,7 +739,7 @@
 
   Assert.ok("adapters" in gfxData);
   Assert.ok(
-    gfxData.adapters.length > 0,
+    !!gfxData.adapters.length,
     "There must be at least one GFX adapter."
   );
   for (let adapter of gfxData.adapters) {
@@ -982,7 +982,7 @@
 function checkExperimentsSection(data) {
   // We don't expect the experiments section to be always available.
   let experiments = data.experiments || {};
-  if (Object.keys(experiments).length == 0) {
+  if (!Object.keys(experiments).length) {
     return;
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/telemetry/tests/unit/test_TelemetrySession.js	2019-09-15 11:33:30.000000000 +0000
@@ -732,7 +732,7 @@
   }
   // No scalar must be reported in classic pings (e.g. saved-session).
   Assert.ok(
-    Object.keys(classic.processes.parent.scalars).length == 0,
+    !Object.keys(classic.processes.parent.scalars).length,
     "Scalars must not be reported in a classic ping."
   );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/thumbnails/test/browser_thumbnails_bg_queueing.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/thumbnails/test/browser_thumbnails_bg_queueing.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/thumbnails/test/browser_thumbnails_bg_queueing.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/thumbnails/test/browser_thumbnails_bg_queueing.js	2019-09-15 11:33:31.000000000 +0000
@@ -16,7 +16,7 @@
     BackgroundPageThumbs.capture(url, {
       timeout: isTimeoutTest ? 100 : 30000,
       onDone: function onDone(capturedURL) {
-        ok(urls.length > 0, "onDone called, so URLs should still remain");
+        ok(!!urls.length, "onDone called, so URLs should still remain");
         is(
           capturedURL,
           urls.shift(),
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/tooltiptext/TooltipTextProvider.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/tooltiptext/TooltipTextProvider.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/tooltiptext/TooltipTextProvider.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/tooltiptext/TooltipTextProvider.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -65,7 +65,7 @@
         var bundle = Services.strings.createBundle(
           "chrome://global/locale/layout/HtmlForm.properties"
         );
-        if (files.length == 0) {
+        if (!files.length) {
           if (tipElement.multiple) {
             titleText = bundle.GetStringFromName("NoFilesSelected");
           } else {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/url-classifier/tests/mochitest/mochitest.ini firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/url-classifier/tests/mochitest/mochitest.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/url-classifier/tests/mochitest/mochitest.ini	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/url-classifier/tests/mochitest/mochitest.ini	2019-09-15 11:33:31.000000000 +0000
@@ -41,6 +41,7 @@
 [test_classifier_match.html]
 [test_classifier_worker.html]
 [test_classify_by_default.html]
+skip-if = fission # Crashes intermittently: @ mozilla::dom::BrowsingContext::CreateFromIPC(mozilla::dom::BrowsingContext::IPCInitializer&&, mozilla::dom::BrowsingContextGroup*, mozilla::dom::ContentParent*)
 [test_classify_ping.html]
 skip-if = (verify && debug && (os == 'win' || os == 'mac'))
 [test_classify_track.html]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/url-classifier/tests/mochitest/test_classifier.html firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/url-classifier/tests/mochitest/test_classifier.html
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/url-classifier/tests/mochitest/test_classifier.html	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/url-classifier/tests/mochitest/test_classifier.html	2019-09-15 11:33:30.000000000 +0000
@@ -99,7 +99,7 @@
         is(errorCode, test.result,
            `Successful asynchronous classification of ${test.url}`);
         SpecialPowers.doUrlClassifyLocal(uri, tables, function(results) {
-          if (results.length == 0) {
+          if (!results.length) {
             is(test.table, "",
                `Successful asynchronous local classification of ${test.url}`);
           } else {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js	2019-09-15 11:33:30.000000000 +0000
@@ -268,7 +268,7 @@
     // work with a copy of the list.
     urls = urls.slice(0);
     var doLookup = function() {
-      if (urls.length > 0) {
+      if (urls.length) {
         var tables = useMoz ? mozTables : allTables;
         var fragment = urls.shift();
         var principal = Services.scriptSecurityManager.createContentPrincipal(
@@ -382,7 +382,7 @@
   };
 
   var runUpdate = function() {
-    if (updates.length > 0) {
+    if (updates.length) {
       var update = updates.shift();
       doStreamUpdate(update, runUpdate, errorUpdate, null);
     } else {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/url-classifier/UrlClassifierHashCompleter.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/url-classifier/UrlClassifierHashCompleter.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/url-classifier/UrlClassifierHashCompleter.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/url-classifier/UrlClassifierHashCompleter.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -292,7 +292,7 @@
 
     // If we don't have an in-flight request, make one
     let pendingUrls = Object.keys(this._pendingRequests);
-    if (!this._currentRequest && pendingUrls.length > 0) {
+    if (!this._currentRequest && pendingUrls.length) {
       let nextUrl = pendingUrls[0];
       this._currentRequest = this._pendingRequests[nextUrl];
       delete this._pendingRequests[nextUrl];
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/url-classifier/UrlClassifierListManager.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/url-classifier/UrlClassifierListManager.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/url-classifier/UrlClassifierListManager.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/url-classifier/UrlClassifierListManager.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -564,7 +564,7 @@
   log("update request: " + JSON.stringify(streamerMap, undefined, 2) + "\n");
 
   // Don't send an empty request.
-  if (streamerMap.requestPayload.length > 0) {
+  if (streamerMap.requestPayload.length) {
     this.makeUpdateRequestForEntry_(
       updateUrl,
       streamerMap.tableList,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/utils/ClientEnvironment.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/utils/ClientEnvironment.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/utils/ClientEnvironment.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/utils/ClientEnvironment.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -42,6 +42,12 @@
   "resource://gre/modules/FirstStartup.jsm"
 );
 
+ChromeUtils.defineModuleGetter(
+  this,
+  "AttributionCode",
+  "resource:///modules/AttributionCode.jsm"
+);
+
 var EXPORTED_SYMBOLS = ["ClientEnvironmentBase"];
 
 /**
@@ -217,4 +223,8 @@
       return rv;
     })();
   }
+
+  static get attribution() {
+    return AttributionCode.getAttrDataAsync();
+  }
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/utils/test/unit/test_ClientEnvironment.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/utils/test/unit/test_ClientEnvironment.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/utils/test/unit/test_ClientEnvironment.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/utils/test/unit/test_ClientEnvironment.js	2019-09-15 11:33:30.000000000 +0000
@@ -44,7 +44,7 @@
     equal(os.darwinVersion, null, "Darwin version should not be set");
   }
 
-  // if on Mac, Mac versions should be set, and Windows versions should not b e
+  // if on Mac, Mac versions should be set, and Windows versions should not be
   if (os.isMac) {
     equal(typeof os.macVersion, "number", "Mac version should be a number");
     equal(
@@ -72,3 +72,15 @@
     );
   }
 });
+
+add_task(async () => {
+  try {
+    await ClientEnvironmentBase.attribution;
+  } catch (ex) {
+    equal(
+      ex.name,
+      "NS_ERROR_FILE_NOT_FOUND",
+      "Test environment does not have attribution data"
+    );
+  }
+});
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/xulstore/old/XULStore.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/xulstore/old/XULStore.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/components/xulstore/old/XULStore.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/components/xulstore/old/XULStore.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -254,10 +254,10 @@
       if (attrs && attr in attrs) {
         delete attrs[attr];
 
-        if (Object.getOwnPropertyNames(attrs).length == 0) {
+        if (!Object.getOwnPropertyNames(attrs).length) {
           delete ids[id];
 
-          if (Object.getOwnPropertyNames(ids).length == 0) {
+          if (!Object.getOwnPropertyNames(ids).length) {
             delete this._data[docURI];
           }
         }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/aboutNetworking.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/aboutNetworking.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/aboutNetworking.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/aboutNetworking.js	2019-09-15 11:33:30.000000000 +0000
@@ -302,7 +302,7 @@
 
   // If the log file was set from an env var, we disable the ability to set it
   // at runtime.
-  if (logPath.length > 0) {
+  if (logPath.length) {
     currentLogFile.innerText = logPath;
     setLogFileButton.disabled = true;
   } else {
@@ -319,7 +319,7 @@
     gEnv.get("NSPR_LOG_MODULES");
   let currentLogModules = document.getElementById("current-log-modules");
   let setLogModulesButton = document.getElementById("set-log-modules-button");
-  if (logModules.length > 0) {
+  if (logModules.length) {
     currentLogModules.innerText = logModules;
     // If the log modules are set by an environment variable at startup, do not
     // allow changing them throught a pref. It would be difficult to figure out
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/aboutSupport.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/aboutSupport.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/aboutSupport.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/aboutSupport.js	2019-09-15 11:33:31.000000000 +0000
@@ -642,7 +642,7 @@
         trs.push(buildRow(key, value));
       }
 
-      if (trs.length == 0) {
+      if (!trs.length) {
         $("graphics-" + id + "-tbody").style.display = "none";
         return;
       }
@@ -686,7 +686,7 @@
           }
 
           let contents;
-          if (entry.message.length > 0 && entry.message[0] == "#") {
+          if (entry.message.length && entry.message[0] == "#") {
             // This is a failure ID. See nsIGfxInfo.idl.
             let m = /#BLOCKLIST_FEATURE_FAILURE_BUG_(\d+)/.exec(entry.message);
             if (m) {
@@ -1327,7 +1327,7 @@
         colHeadings[i] = this._nodeText(col).trim();
       }
     }
-    let hasColHeadings = Object.keys(colHeadings).length > 0;
+    let hasColHeadings = !!Object.keys(colHeadings).length;
     if (!hasColHeadings) {
       tableHeadingElem = null;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/aboutTelemetry.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/aboutTelemetry.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/aboutTelemetry.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/aboutTelemetry.js	2019-09-15 11:33:31.000000000 +0000
@@ -367,7 +367,7 @@
     let sourceArchivedContainer = document.getElementById(
       "ping-source-archive-container"
     );
-    let archivedDisabled = archivedPingList.length == 0;
+    let archivedDisabled = !archivedPingList.length;
     sourceArchived.disabled = archivedDisabled;
     sourceArchivedContainer.classList.toggle("disabled", archivedDisabled);
 
@@ -753,7 +753,7 @@
     );
     this.renderPersona(addons, addonSection, "persona");
 
-    let hasAddonData = Object.keys(ping.environment.addons).length > 0;
+    let hasAddonData = !!Object.keys(ping.environment.addons).length;
     let s = GenericSubsection.renderSubsectionHeader(
       "addons",
       hasAddonData,
@@ -981,7 +981,7 @@
       hideE.hidden = true;
     }
 
-    if (aStacks.length == 0) {
+    if (!aStacks.length) {
       return;
     }
 
@@ -1124,9 +1124,7 @@
         ? payload.processes.parent.capturedStacks
         : false;
     let hasData =
-      capturedStacks &&
-      capturedStacks.stacks &&
-      capturedStacks.stacks.length > 0;
+      capturedStacks && capturedStacks.stacks && !!capturedStacks.stacks.length;
     setHasData("captured-stacks-section", hasData);
     if (!hasData) {
       return;
@@ -1584,7 +1582,7 @@
 function RenderObject(aObject) {
   let output = "";
   if (Array.isArray(aObject)) {
-    if (aObject.length == 0) {
+    if (!aObject.length) {
       return "[]";
     }
     output = "[" + JSON.stringify(aObject[0]);
@@ -1594,7 +1592,7 @@
     return output + "]";
   }
   let keys = Object.keys(aObject);
-  if (keys.length == 0) {
+  if (!keys.length) {
     return "{}";
   }
   output = '{"' + keys[0] + '":\u00A0' + JSON.stringify(aObject[keys[0]]);
@@ -1763,7 +1761,7 @@
     let addonSection = document.getElementById("addon-details");
     removeAllChildNodes(addonSection);
     let addonDetails = aPing.payload.addonDetails;
-    const hasData = addonDetails && Object.keys(addonDetails).length > 0;
+    const hasData = addonDetails && !!Object.keys(addonDetails).length;
     setHasData("addon-details-section", hasData);
     if (!hasData) {
       return;
@@ -1792,7 +1790,7 @@
 
 class Section {
   static renderContent(data, process, div, section) {
-    if (data && Object.keys(data).length > 0) {
+    if (data && Object.keys(data).length) {
       let s = GenericSubsection.renderSubsectionHeader(process, true, section);
       let heading = document.createElement("h2");
       document.l10n.setAttributes(heading, "about-telemetry-process", {
@@ -1968,7 +1966,7 @@
       for (const process of Object.keys(aPayload.processes)) {
         let data = aPayload.processes[process].events;
         hasData = hasData || data !== {};
-        if (data && Object.keys(data).length > 0) {
+        if (data && Object.keys(data).length) {
           let s = GenericSubsection.renderSubsectionHeader(
             process,
             true,
@@ -1990,7 +1988,7 @@
       for (const process of Object.keys(aPayload.events)) {
         let data = process;
         hasData = hasData || data !== {};
-        if (data && Object.keys(data).length > 0) {
+        if (data && Object.keys(data).length) {
           let s = GenericSubsection.renderSubsectionHeader(
             process,
             true,
@@ -2498,7 +2496,7 @@
     let infoSection = document.getElementById("session-info");
     removeAllChildNodes(infoSection);
 
-    let hasData = Object.keys(aPayload.info).length > 0;
+    let hasData = !!Object.keys(aPayload.info).length;
     setHasData("session-info-section", hasData);
 
     if (hasData) {
@@ -2516,7 +2514,7 @@
     let simpleMeasurements = this.sortStartupMilestones(
       aPayload.simpleMeasurements
     );
-    let hasData = Object.keys(simpleMeasurements).length > 0;
+    let hasData = !!Object.keys(simpleMeasurements).length;
     setHasData("simple-measurements-section", hasData);
 
     if (hasData) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/aboutUrlClassifier.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/aboutUrlClassifier.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/aboutUrlClassifier.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/aboutUrlClassifier.js	2019-09-15 11:33:30.000000000 +0000
@@ -656,7 +656,7 @@
       env.get("MOZ_LOG_MODULES") ||
       env.get("NSPR_LOG_MODULES");
 
-    if (logModules.length > 0) {
+    if (logModules.length) {
       document.getElementById("set-log-modules").disabled = true;
       for (let module of this.modules) {
         document.getElementById("chk-" + module).disabled = true;
@@ -669,7 +669,7 @@
     // Disable set log file if log file is already set
     // by environment variable.
     let logFile = env.get("MOZ_LOG_FILE") || env.get("NSPR_LOG_FILE");
-    if (logFile.length > 0) {
+    if (logFile.length) {
       document.getElementById("set-log-file").disabled = true;
       document.getElementById("log-file").value = logFile;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/license.html firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/license.html
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/license.html	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/license.html	2019-09-15 11:33:31.000000000 +0000
@@ -140,7 +140,6 @@
       <li><a href="about:license#node-properties">node-properties License</a></li>
       <li><a href="about:license#nom">nom License</a></li>
       <li><a href="about:license#nrappkit">nrappkit License</a></li>
-      <li><a href="about:license#openaes">OpenAES License</a></li>
       <li><a href="about:license#openldap">OpenLDAP Public License</a></li>
       <li><a href="about:license#openvision">OpenVision License</a></li>
 #if defined(XP_WIN) || defined(XP_MACOSX) || defined(XP_LINUX)
@@ -4948,41 +4947,6 @@
 </pre>
 
 
-    <hr>
-
-    <h1><a id="openaes"></a>OpenAES License</h1>
-
-    <p>This license applies to certain files in the directory
-    <code>media/gmp-clearkey/0.1/openaes</code>.
-    </p>
-
-<pre>
-Copyright (c) 2012, Nabil S. Al Ramli, www.nalramli.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  - Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-</pre>
-
-
     <hr>
 
     <h1><a id="openldap"></a>OpenLDAP Public License</h1>
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/minimal-xul.css firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/minimal-xul.css
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/minimal-xul.css	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/minimal-xul.css	2019-09-15 11:33:30.000000000 +0000
@@ -66,6 +66,13 @@
    */
   font: 16px sans-serif;
 
+  /* The initial value of justify-items is `legacy`, which makes it depend on
+   * the parent style.
+   *
+   * Reset it to something else.
+   */
+  justify-items: start;
+
   /* Duplicate the rules from the '*' rule above, which were clobbered by the
    * 'all: initial' declaration.
    *
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/plugins.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/plugins.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/plugins.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/plugins.js	2019-09-15 11:33:31.000000000 +0000
@@ -22,7 +22,7 @@
 
   // "Installed plugins"
   var id, label;
-  if (aPlugins.length > 0) {
+  if (aPlugins.length) {
     id = "plugs";
     label = "installed-plugins-label";
   } else {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/tests/widgets/test_videocontrols.html firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/tests/widgets/test_videocontrols.html
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/tests/widgets/test_videocontrols.html	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/tests/widgets/test_videocontrols.html	2019-09-15 11:33:30.000000000 +0000
@@ -92,7 +92,7 @@
     expectingEventPromise.reject(new Error(`Got event: ${event.type}, expected: ${checkingEvent}`));
   }
 
-  if (expectingEvents.length == 0) {
+  if (!expectingEvents.length) {
     SimpleTest.executeSoon(expectingEventPromise.resolve);
   }
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/tests/widgets/tree_shared.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/tests/widgets/tree_shared.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/tests/widgets/tree_shared.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/tests/widgets/tree_shared.js	2019-09-15 11:33:31.000000000 +0000
@@ -1312,7 +1312,7 @@
       return false;
     },
     isContainerEmpty(row) {
-      return row.children != null && row.children.rows.length == 0;
+      return row.children != null && !row.children.rows.length;
     },
     isSeparator(row) {
       return row.separator;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/treeUtils.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/treeUtils.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/treeUtils.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/treeUtils.js	2019-09-15 11:33:30.000000000 +0000
@@ -62,7 +62,7 @@
     aLastSortAscending
   ) {
     var ascending = aColumn == aLastSortColumn ? !aLastSortAscending : true;
-    if (aDataSet.length == 0) {
+    if (!aDataSet.length) {
       return ascending;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/widgets/marquee.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/widgets/marquee.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/widgets/marquee.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/widgets/marquee.js	2019-09-15 11:33:30.000000000 +0000
@@ -379,7 +379,7 @@
   }
 
   _mutationActor(aMutations) {
-    while (aMutations.length > 0) {
+    while (aMutations.length) {
       var mutation = aMutations.shift();
       var attrName = mutation.attributeName.toLowerCase();
       var oldValue = mutation.oldValue;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/widgets/richlistbox.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/widgets/richlistbox.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/widgets/richlistbox.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/widgets/richlistbox.js	2019-09-15 11:33:30.000000000 +0000
@@ -176,7 +176,7 @@
       this.selectItem(val);
     }
     get selectedItem() {
-      return this.selectedItems.length > 0 ? this.selectedItems[0] : null;
+      return this.selectedItems.length ? this.selectedItems[0] : null;
     }
 
     // nsIDOMXULSelectControlElement
@@ -197,7 +197,7 @@
       }
     }
     get selectedIndex() {
-      if (this.selectedItems.length > 0) {
+      if (this.selectedItems.length) {
         return this.getIndexOfItem(this.selectedItems[0]);
       }
       return -1;
@@ -212,7 +212,7 @@
       return val;
     }
     get value() {
-      if (this.selectedItems.length > 0) {
+      if (this.selectedItems.length) {
         return this.selectedItem.value;
       }
       return null;
@@ -573,7 +573,7 @@
     // nsIDOMXULMultiSelectControlElement
     clearSelection() {
       if (this.selectedItems) {
-        while (this.selectedItems.length > 0) {
+        while (this.selectedItems.length) {
           let item = this.selectedItems[0];
           item.selected = false;
           this.selectedItems.remove(item);
@@ -642,7 +642,7 @@
     scrollOnePage(aDirection) {
       var children = this.itemChildren;
 
-      if (children.length == 0) {
+      if (!children.length) {
         return 0;
       }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/widgets/toolbarbutton.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/widgets/toolbarbutton.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/widgets/toolbarbutton.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/widgets/toolbarbutton.js	2019-09-15 11:33:32.000000000 +0000
@@ -109,7 +109,7 @@
 
         this.appendChild(this.constructor.badgedFragment.cloneNode(true));
 
-        if (moveChildren.length > 0) {
+        if (moveChildren.length) {
           let { badgeStack, icon } = this;
           for (let child of moveChildren) {
             badgeStack.insertBefore(child, icon);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/widgets/tree.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/widgets/tree.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/content/widgets/tree.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/content/widgets/tree.js	2019-09-15 11:33:31.000000000 +0000
@@ -820,6 +820,55 @@
           return;
         }
 
+        let toggleClose = () => {
+          if (this._editingColumn) {
+            return;
+          }
+
+          let row = this.currentIndex;
+          if (row < 0) {
+            return;
+          }
+
+          if (this.changeOpenState(this.currentIndex, false)) {
+            event.preventDefault();
+            return;
+          }
+
+          let parentIndex = this.view.getParentIndex(this.currentIndex);
+          if (parentIndex >= 0) {
+            this.view.selection.select(parentIndex);
+            this.ensureRowIsVisible(parentIndex);
+            event.preventDefault();
+          }
+        };
+
+        let toggleOpen = () => {
+          if (this._editingColumn) {
+            return;
+          }
+
+          let row = this.currentIndex;
+          if (row < 0) {
+            return;
+          }
+
+          if (this.changeOpenState(row, true)) {
+            event.preventDefault();
+            return;
+          }
+          let c = row + 1;
+          let view = this.view;
+          if (c < view.rowCount && view.getParentIndex(c) == row) {
+            // If already opened, select the first child.
+            // The getParentIndex test above ensures that the children
+            // are already populated and ready.
+            this.view.selection.timedSelect(c, this._selectDelay);
+            this.ensureRowIsVisible(c);
+            event.preventDefault();
+          }
+        };
+
         switch (event.keyCode) {
           case KeyEvent.DOM_VK_RETURN: {
             if (this._handleEnter(event)) {
@@ -838,50 +887,18 @@
             break;
           }
           case KeyEvent.DOM_VK_LEFT: {
-            if (this._editingColumn) {
-              return;
-            }
-
-            let row = this.currentIndex;
-            if (row < 0) {
-              return;
-            }
-
-            if (this.changeOpenState(this.currentIndex, false)) {
-              event.preventDefault();
-              return;
-            }
-            let parentIndex = this.view.getParentIndex(this.currentIndex);
-            if (parentIndex >= 0) {
-              this.view.selection.select(parentIndex);
-              this.ensureRowIsVisible(parentIndex);
-              event.preventDefault();
+            if (!this.isRTL) {
+              toggleClose();
+            } else {
+              toggleOpen();
             }
             break;
           }
           case KeyEvent.DOM_VK_RIGHT: {
-            if (this._editingColumn) {
-              return;
-            }
-
-            let row = this.currentIndex;
-            if (row < 0) {
-              return;
-            }
-
-            if (this.changeOpenState(row, true)) {
-              event.preventDefault();
-              return;
-            }
-            let c = row + 1;
-            let view = this.view;
-            if (c < view.rowCount && view.getParentIndex(c) == row) {
-              // If already opened, select the first child.
-              // The getParentIndex test above ensures that the children
-              // are already populated and ready.
-              this.view.selection.timedSelect(c, this._selectDelay);
-              this.ensureRowIsVisible(c);
-              event.preventDefault();
+            if (!this.isRTL) {
+              toggleOpen();
+            } else {
+              toggleClose();
             }
             break;
           }
@@ -995,6 +1012,10 @@
       return this.treeBody;
     }
 
+    get isRTL() {
+      return document.defaultView.getComputedStyle(this).direction == "rtl";
+    }
+
     set editable(val) {
       if (val) {
         this.setAttribute("editable", "true");
@@ -1160,8 +1181,7 @@
     }
 
     _getColumnAtX(aX, aThresh, aPos) {
-      var isRTL =
-        document.defaultView.getComputedStyle(this).direction == "rtl";
+      let isRTL = this.isRTL;
 
       if (aPos) {
         aPos.value = isRTL ? "after" : "before";
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/crashreporter/CrashSubmit.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/crashreporter/CrashSubmit.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/crashreporter/CrashSubmit.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/crashreporter/CrashSubmit.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -272,7 +272,7 @@
       );
     }
 
-    if (this.additionalDumps.length > 0) {
+    if (this.additionalDumps.length) {
       let names = [];
       for (let i of this.additionalDumps) {
         names.push(i.name);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/ActorManagerChild.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/ActorManagerChild.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/ActorManagerChild.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/ActorManagerChild.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -110,7 +110,7 @@
       this.messages.set(msg, actors);
     }
 
-    if (actors.length == 0) {
+    if (!actors.length) {
       this.mm.addMessageListener(msg, this);
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/AppMenuNotifications.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/AppMenuNotifications.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/AppMenuNotifications.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/AppMenuNotifications.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -42,7 +42,7 @@
         this.uninit();
         break;
       case "appMenu-notifications-request":
-        if (this._notifications.length != 0) {
+        if (this._notifications.length) {
           Services.obs.notifyObservers(null, "appMenu-notifications", "init");
         }
         break;
@@ -50,7 +50,7 @@
   },
 
   get activeNotification() {
-    if (this._notifications.length > 0) {
+    if (this._notifications.length) {
       const doorhanger = this._notifications.find(
         n => !n.dismissed && !n.options.badgeOnly
       );
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/CertUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/CertUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/CertUtils.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/CertUtils.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -27,7 +27,7 @@
  *         expected certificate's attribute names / values.
  */
 function readCertPrefs(aPrefBranch) {
-  if (Services.prefs.getBranch(aPrefBranch).getChildList("").length == 0) {
+  if (!Services.prefs.getBranch(aPrefBranch).getChildList("").length) {
     return null;
   }
 
@@ -36,7 +36,7 @@
   while (true) {
     let prefBranchCert = Services.prefs.getBranch(aPrefBranch + counter + ".");
     let prefCertAttrs = prefBranchCert.getChildList("");
-    if (prefCertAttrs.length == 0) {
+    if (!prefCertAttrs.length) {
       break;
     }
 
@@ -70,7 +70,7 @@
  */
 function validateCert(aCertificate, aCerts) {
   // If there are no certificate requirements then just exit
-  if (!aCerts || aCerts.length == 0) {
+  if (!aCerts || !aCerts.length) {
     return;
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/Console.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/Console.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/Console.jsm	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/Console.jsm	2019-09-15 11:33:32.000000000 +0000
@@ -233,7 +233,7 @@
       reply += "  " + debugElement(aThing) + "\n";
     } else {
       let keys = Object.getOwnPropertyNames(aThing);
-      if (keys.length > 0) {
+      if (keys.length) {
         reply += type + "\n";
         keys.forEach(function(aProp) {
           reply += logProperty(aProp, aThing[aProp]);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/InlineSpellChecker.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/InlineSpellChecker.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/InlineSpellChecker.jsm	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/InlineSpellChecker.jsm	2019-09-15 11:33:32.000000000 +0000
@@ -338,7 +338,7 @@
   },
   // callback for removing the last added word to the dictionary LIFO fashion
   undoAddToDictionary() {
-    if (this.mAddedWordStack.length > 0) {
+    if (this.mAddedWordStack.length) {
       var word = this.mAddedWordStack.pop();
       if (this.mRemote) {
         this.mRemote.undoAddToDictionary(word);
@@ -349,7 +349,7 @@
   },
   canUndo() {
     // Return true if we have words on the stack
-    return this.mAddedWordStack.length > 0;
+    return !!this.mAddedWordStack.length;
   },
   ignoreWord() {
     if (this.mRemote) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/NewTabUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/NewTabUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/NewTabUtils.jsm	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/NewTabUtils.jsm	2019-09-15 11:33:32.000000000 +0000
@@ -542,7 +542,7 @@
    * @return Whether the list is empty.
    */
   isEmpty: function BlockedLinks_isEmpty() {
-    return Object.keys(this.links).length == 0;
+    return !Object.keys(this.links).length;
   },
 
   /**
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/PopupNotifications.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/PopupNotifications.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/PopupNotifications.jsm	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/PopupNotifications.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -1074,7 +1074,7 @@
       popupnotification.notification = n;
       let menuitems = [];
 
-      if (n.mainAction && n.secondaryActions && n.secondaryActions.length > 0) {
+      if (n.mainAction && n.secondaryActions && n.secondaryActions.length) {
         let telemetryStatId = TELEMETRY_STAT_ACTION_2;
 
         let secondaryAction = n.secondaryActions[0];
@@ -1334,7 +1334,7 @@
       notifications = this._currentNotifications;
     }
 
-    let haveNotifications = notifications.length > 0;
+    let haveNotifications = !!notifications.length;
     if (!anchors.size && haveNotifications) {
       anchors = this._getAnchorsForNotifications(notifications);
     }
@@ -1381,7 +1381,7 @@
       }
     }
 
-    if (notificationsToShow.length > 0) {
+    if (notificationsToShow.length) {
       let anchorElement = anchors.values().next().value;
       if (anchorElement) {
         this._showPanel(notificationsToShow, anchorElement);
@@ -1443,7 +1443,7 @@
           /([-\w]+-notification-icon\s?)/g,
           ""
         );
-        if (notifications.length > 0) {
+        if (notifications.length) {
           // Find the first notification this anchor used for.
           let notification = notifications[0];
           for (let n of notifications) {
@@ -1555,7 +1555,7 @@
       return;
     }
 
-    if (this._currentNotifications.length == 0) {
+    if (!this._currentNotifications.length) {
       return;
     }
 
@@ -1627,7 +1627,7 @@
     let ourNotifications = this._getNotificationsForBrowser(ourBrowser);
     let other = otherBrowser.ownerGlobal.PopupNotifications;
     if (!other) {
-      if (ourNotifications.length > 0) {
+      if (ourNotifications.length) {
         Cu.reportError(
           "unable to swap notifications: otherBrowser doesn't support notifications"
         );
@@ -1667,10 +1667,10 @@
     this._setNotificationsForBrowser(otherBrowser, ourNotifications);
     other._setNotificationsForBrowser(ourBrowser, otherNotifications);
 
-    if (otherNotifications.length > 0) {
+    if (otherNotifications.length) {
       this._update(otherNotifications);
     }
-    if (ourNotifications.length > 0) {
+    if (ourNotifications.length) {
       other._update(ourNotifications);
     }
   },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/Promise-backend.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/Promise-backend.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/Promise-backend.js	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/Promise-backend.js	2019-09-15 11:33:32.000000000 +0000
@@ -737,7 +737,7 @@
     // Change the promise status and schedule our handlers for processing.
     aPromise[N_INTERNALS].status = aStatus;
     aPromise[N_INTERNALS].value = aValue;
-    if (aPromise[N_INTERNALS].handlers.length > 0) {
+    if (aPromise[N_INTERNALS].handlers.length) {
       this.schedulePromise(aPromise);
     } else if (Cu && aStatus == STATUS_REJECTED) {
       // This is a rejection and the promise is the last in the chain.
@@ -841,7 +841,7 @@
     }
 
     // Process all the known handlers eagerly.
-    while (this.handlers.length > 0) {
+    while (this.handlers.length) {
       this.handlers.shift().process();
     }
   },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/sessionstore/SessionHistory.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/sessionstore/SessionHistory.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/sessionstore/SessionHistory.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/sessionstore/SessionHistory.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -115,10 +115,7 @@
     // If either the session history isn't available yet or doesn't have any
     // valid entries, make sure we at least include the current page,
     // unless of course we just skipped all entries because aFromIdx was big enough.
-    if (
-      data.entries.length == 0 &&
-      (skippedCount != entryCount || aFromIdx < 0)
-    ) {
+    if (!data.entries.length && (skippedCount != entryCount || aFromIdx < 0)) {
       let uri = webNavigation.currentURI.displaySpec;
       let body = webNavigation.document.body;
       // We landed here because the history is inaccessible or there are no
@@ -233,7 +230,7 @@
               Object.getOwnPropertyNames(presState).length > 1
           );
 
-        if (presStates.length > 0) {
+        if (presStates.length) {
           entry.presState = presStates;
         }
       }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/ShortcutUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/ShortcutUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/ShortcutUtils.jsm	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/ShortcutUtils.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -292,7 +292,7 @@
     let keycode = this.getKeycodeAttribute(chromeKey);
 
     let baseSelector = "key";
-    if (modifiers.length > 0) {
+    if (modifiers.length) {
       baseSelector += `[modifiers="${modifiersString}"]`;
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/Sqlite.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/Sqlite.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/Sqlite.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/Sqlite.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -1584,7 +1584,7 @@
         "WHERE type = 'table' AND name=?",
       [name]
     ).then(function onResult(rows) {
-      return Promise.resolve(rows.length > 0);
+      return Promise.resolve(!!rows.length);
     });
   },
 
@@ -1603,7 +1603,7 @@
         "WHERE type = 'index' AND name=?",
       [name]
     ).then(function onResult(rows) {
-      return Promise.resolve(rows.length > 0);
+      return Promise.resolve(!!rows.length);
     });
   },
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/subprocess/subprocess_worker_common.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/subprocess/subprocess_worker_common.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/subprocess/subprocess_worker_common.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/subprocess/subprocess_worker_common.js	2019-09-15 11:33:31.000000000 +0000
@@ -30,7 +30,7 @@
   shiftPending() {
     let result = this.pending.shift();
 
-    if (this.closing && this.pending.length == 0) {
+    if (this.closing && !this.pending.length) {
       this.close();
     }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/subprocess/subprocess_worker_unix.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/subprocess/subprocess_worker_unix.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/subprocess/subprocess_worker_unix.js	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/subprocess/subprocess_worker_unix.js	2019-09-15 11:33:31.000000000 +0000
@@ -165,7 +165,7 @@
       }
     }
 
-    if (reads.length == 0) {
+    if (!reads.length) {
       io.updatePollFds();
     }
     return result;
@@ -250,7 +250,7 @@
       }
     }
 
-    if (writes.length == 0) {
+    if (!writes.length) {
       io.updatePollFds();
     }
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/tests/chrome/test_findCssSelector.html firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/tests/chrome/test_findCssSelector.html
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/tests/chrome/test_findCssSelector.html	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/tests/chrome/test_findCssSelector.html	2019-09-15 11:33:30.000000000 +0000
@@ -20,7 +20,7 @@
 }
 
 function runNextTest() {
-  if (_tests.length == 0) {
+  if (!_tests.length) {
     SimpleTest.finish();
     return;
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/tests/modules/PromiseTestUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/tests/modules/PromiseTestUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/tests/modules/PromiseTestUtils.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/tests/modules/PromiseTestUtils.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -238,7 +238,7 @@
     JSMPromise.Debugging.flushUncaughtErrors();
 
     // If there is any uncaught rejection left at this point, the test fails.
-    while (this._rejections.length > 0) {
+    while (this._rejections.length) {
       let rejection = this._rejections.shift();
 
       // If one of the ignore functions matches, ignore the rejection, then
@@ -277,7 +277,7 @@
    */
   assertNoMoreExpectedRejections() {
     // Only log this condition is there is a failure.
-    if (this._rejectionIgnoreFns.length > 0) {
+    if (this._rejectionIgnoreFns.length) {
       Assert.equal(
         this._rejectionIgnoreFns.length,
         0,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/tests/xpcshell/test_Promise.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/tests/xpcshell/test_Promise.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/tests/xpcshell/test_Promise.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/tests/xpcshell/test_Promise.js	2019-09-15 11:33:30.000000000 +0000
@@ -722,7 +722,7 @@
     }
 
     let p1 = Promise.all([]).then(function onResolve(val) {
-      Assert.ok(Array.isArray(val) && val.length == 0);
+      Assert.ok(Array.isArray(val) && !val.length);
     });
 
     let p2 = Promise.all([1, 2, 3]).then(function onResolve([
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/Troubleshoot.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/Troubleshoot.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/modules/Troubleshoot.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/modules/Troubleshoot.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -247,20 +247,20 @@
       .trim();
     data.keyLocationServiceGoogleFound =
       keyLocationServiceGoogle != "no-google-location-service-api-key" &&
-      keyLocationServiceGoogle.length > 0;
+      !!keyLocationServiceGoogle.length;
 
     const keySafebrowsingGoogle = Services.urlFormatter
       .formatURL("%GOOGLE_SAFEBROWSING_API_KEY%")
       .trim();
     data.keySafebrowsingGoogleFound =
       keySafebrowsingGoogle != "no-google-safebrowsing-api-key" &&
-      keySafebrowsingGoogle.length > 0;
+      !!keySafebrowsingGoogle.length;
 
     const keyMozilla = Services.urlFormatter
       .formatURL("%MOZILLA_API_KEY%")
       .trim();
     data.keyMozillaFound =
-      keyMozilla != "no-mozilla-api-key" && keyMozilla.length > 0;
+      keyMozilla != "no-mozilla-api-key" && !!keyMozilla.length;
 
     done(data);
   },
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/downloads/DownloadUtils.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/downloads/DownloadUtils.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/downloads/DownloadUtils.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/downloads/DownloadUtils.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -453,7 +453,7 @@
       // Display special text for file protocol
       displayHost = gBundle.GetStringFromName(gStr.doneFileScheme);
       fullHost = displayHost;
-    } else if (displayHost.length == 0) {
+    } else if (!displayHost.length) {
       // Got nothing; show the scheme (data: about: moz-icon:)
       displayHost = gBundle.formatStringFromName(gStr.doneScheme, [uri.scheme]);
       fullHost = displayHost;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/AddonManager.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/AddonManager.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/AddonManager.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/AddonManager.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -87,7 +87,7 @@
 // since it needs to be able to track things like new frameLoader globals that
 // are created before other framework code has been initialized.
 Services.ppmm.loadProcessScript(
-  "data:,ChromeUtils.import('resource://gre/modules/ExtensionProcessScript.jsm')",
+  "resource://gre/modules/extensionProcessScriptLoader.js",
   true
 );
 
@@ -987,7 +987,7 @@
       this.types[type].providers = this.types[type].providers.filter(
         p => p != aProvider
       );
-      if (this.types[type].providers.length == 0) {
+      if (!this.types[type].providers.length) {
         let oldType = this.types[type].type;
         delete this.types[type];
 
@@ -1366,7 +1366,7 @@
     let difference = Extension.comparePermissions(oldPerms, newPerms);
 
     // If there are no new permissions, just go ahead with the update
-    if (difference.origins.length == 0 && difference.permissions.length == 0) {
+    if (!difference.origins.length && !difference.permissions.length) {
       return Promise.resolve();
     }
 
@@ -4614,7 +4614,7 @@
 
     extra = { ...extraVars, ...extra };
 
-    let hasExtraVars = Object.keys(extra).length > 0;
+    let hasExtraVars = !!Object.keys(extra).length;
     extra = this.formatExtraVars(extra);
 
     this.recordEvent({
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/Blocklist.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/Blocklist.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/Blocklist.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/Blocklist.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -466,12 +466,12 @@
 
   // Iterate the targeted applications, at least one of them must match.
   // If no target application, keep the entry.
-  if (versionRange.length == 0) {
+  if (!versionRange.length) {
     return entry;
   }
   for (const vr of versionRange) {
     const { targetApplication = [] } = vr;
-    if (targetApplication.length == 0) {
+    if (!targetApplication.length) {
       return entry;
     }
     for (const ta of targetApplication) {
@@ -1525,7 +1525,7 @@
   let os = blocklistElement.getAttribute("os");
   if (os) {
     let choices = os.split(",");
-    if (choices.length > 0 && !choices.includes(gApp.OS)) {
+    if (choices.length && !choices.includes(gApp.OS)) {
       return false;
     }
   }
@@ -1533,7 +1533,7 @@
   let xpcomabi = blocklistElement.getAttribute("xpcomabi");
   if (xpcomabi) {
     let choices = xpcomabi.split(",");
-    if (choices.length > 0 && !choices.includes(gApp.XPCOMABI)) {
+    if (choices.length && !choices.includes(gApp.XPCOMABI)) {
       return false;
     }
   }
@@ -2257,7 +2257,7 @@
             );
         }
       }
-      if (this._gfxEntries.length > 0) {
+      if (this._gfxEntries.length) {
         this._notifyObserversBlocklistGFX();
       }
     } catch (e) {
@@ -2337,7 +2337,7 @@
     }
     // if only the extension ID is specified block all versions of the
     // extension for the current application.
-    if (blockEntry.versions.length == 0) {
+    if (!blockEntry.versions.length) {
       blockEntry.versions.push(new BlocklistItemData(null));
     }
 
@@ -2384,7 +2384,7 @@
       return;
     }
     // Add a default versionRange if there wasn't one specified
-    if (blockEntry.versions.length == 0) {
+    if (!blockEntry.versions.length) {
       blockEntry.versions.push(new BlocklistItemData(null));
     }
 
@@ -2796,7 +2796,7 @@
       }
     }
 
-    if (addonList.length == 0) {
+    if (!addonList.length) {
       this._notifyObserversBlocklistUpdated();
       return;
     }
@@ -3026,7 +3026,7 @@
     }
     // return minVersion = null and maxVersion = null if no specific versionRange
     // elements were found
-    if (appVersions.length == 0) {
+    if (!appVersions.length) {
       appVersions.push({ minVersion: null, maxVersion: null });
     }
     return appVersions;
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/content/aboutaddonsCommon.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/content/aboutaddonsCommon.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/content/aboutaddonsCommon.js	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/content/aboutaddonsCommon.js	2019-09-15 11:33:31.000000000 +0000
@@ -59,7 +59,7 @@
     let difference = Extension.comparePermissions(oldPerms, newPerms);
 
     // If there are no new permissions, just proceed
-    if (difference.origins.length == 0 && difference.permissions.length == 0) {
+    if (!difference.origins.length && !difference.permissions.length) {
       return Promise.resolve();
     }
 
@@ -128,7 +128,7 @@
   }
 
   const { origins, permissions } = addon.userPermissions;
-  return origins.length > 0 || permissions.length > 0;
+  return !!origins.length || !!permissions.length;
 }
 
 function showPermissionsPrompt(addon) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/content/aboutaddons.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/content/aboutaddons.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/content/aboutaddons.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/content/aboutaddons.js	2019-09-15 11:33:31.000000000 +0000
@@ -852,7 +852,7 @@
 
 class AddonOptions extends HTMLElement {
   connectedCallback() {
-    if (this.children.length == 0) {
+    if (!this.children.length) {
       this.render();
     }
   }
@@ -1035,7 +1035,7 @@
 
 class ContentSelectDropdown extends HTMLElement {
   connectedCallback() {
-    if (this.children.length > 0) {
+    if (this.children.length) {
       return;
     }
     // This creates the menulist and menupopup elements needed for the inline
@@ -1332,7 +1332,7 @@
 
     this.textContent = "";
 
-    if (msgs.length > 0) {
+    if (msgs.length) {
       // Add a row for each permission message.
       for (let msg of msgs) {
         let row = document.createElement("div");
@@ -1363,7 +1363,7 @@
 
 class AddonDetails extends HTMLElement {
   connectedCallback() {
-    if (this.children.length == 0) {
+    if (!this.children.length) {
       this.render();
     }
     this.deck.addEventListener("view-changed", this);
@@ -1396,6 +1396,11 @@
           }
           break;
       }
+
+      // When a details view is rendered again, the default details view is
+      // unconditionally shown. So if any other tab is selected, do not save
+      // the current scroll offset, but start at the top of the page instead.
+      ScrollOffsets.canRestore = this.deck.selectedViewName === "details";
     }
   }
 
@@ -1623,7 +1628,7 @@
 class AddonCard extends HTMLElement {
   connectedCallback() {
     // If we've already rendered we can just update, otherwise render.
-    if (this.children.length > 0) {
+    if (this.children.length) {
       this.update();
     } else {
       this.render();
@@ -1653,7 +1658,7 @@
 
   set updateInstall(install) {
     this._updateInstall = install;
-    if (this.children.length > 0) {
+    if (this.children.length) {
       this.update();
     }
   }
@@ -1678,7 +1683,7 @@
     if (install && install.state == AddonManager.STATE_AVAILABLE) {
       this.updateInstall = install;
     }
-    if (this.children.length > 0) {
+    if (this.children.length) {
       this.render();
     }
   }
@@ -2062,7 +2067,7 @@
   }
 
   expand() {
-    if (this.children.length == 0) {
+    if (!this.children.length) {
       this.expanded = true;
     } else {
       throw new Error("expand() is only supported before render()");
@@ -2374,7 +2379,7 @@
     // happpen as close to each other as possible.
     this.registerListener();
     // Don't render again if we were rendered prior to being inserted.
-    if (this.children.length == 0) {
+    if (!this.children.length) {
       // Render the initial view.
       this.render();
     }
@@ -2540,7 +2545,7 @@
     let sectionCards = this.getCards(section);
 
     // If this is the first card in the section, create the heading.
-    if (sectionCards.length == 0) {
+    if (!sectionCards.length) {
       section.appendChild(this.createSectionHeading(sectionIndex));
     }
 
@@ -2616,7 +2621,7 @@
     section.setAttribute("section", index);
 
     // Render the heading and add-ons if there are any.
-    if (addons.length > 0) {
+    if (addons.length) {
       section.appendChild(this.createSectionHeading(index));
 
       for (let addon of addons) {
@@ -3168,6 +3173,40 @@
 }
 
 /**
+ * Helper for saving and restoring the scroll offsets when a previously loaded
+ * view is accessed again.
+ */
+var ScrollOffsets = {
+  _key: null,
+  _offsets: new Map(),
+  canRestore: true,
+
+  setView(historyEntryId) {
+    this._key = historyEntryId;
+    this.canRestore = true;
+  },
+
+  getPosition() {
+    if (!this.canRestore) {
+      return { top: 0, left: 0 };
+    }
+    let { scrollTop: top, scrollLeft: left } = document.documentElement;
+    return { top, left };
+  },
+
+  save() {
+    if (this._key) {
+      this._offsets.set(this._key, this.getPosition());
+    }
+  },
+
+  restore() {
+    let { top = 0, left = 0 } = this._offsets.get(this._key) || {};
+    window.scrollTo({ top, left, behavior: "auto" });
+  },
+};
+
+/**
  * Called from extensions.js once, when about:addons is loading.
  */
 function initialize(opts) {
@@ -3193,7 +3232,7 @@
  * resolve once the view has been updated to conform with other about:addons
  * views.
  */
-async function show(type, param, { isKeyboardNavigation }) {
+async function show(type, param, { isKeyboardNavigation, historyEntryId }) {
   let container = document.createElement("div");
   container.setAttribute("current-view", type);
   if (type == "list") {
@@ -3222,10 +3261,26 @@
   } else {
     throw new Error(`Unknown view type: ${type}`);
   }
+
+  ScrollOffsets.save();
+  ScrollOffsets.setView(historyEntryId);
   mainEl.textContent = "";
   mainEl.appendChild(container);
+
+  // Most content has been rendered at this point. The only exception are
+  // recommendations in the discovery pane and extension/theme list, because
+  // they rely on remote data. If loaded before, then these may be rendered
+  // within one tick, so wait a frame before restoring scroll offsets.
+  return new Promise(resolve => {
+    window.requestAnimationFrame(() => {
+      ScrollOffsets.restore();
+      resolve();
+    });
+  });
 }
 
 function hide() {
+  ScrollOffsets.save();
+  ScrollOffsets.setView(null);
   mainEl.textContent = "";
 }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/content/extensions.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/content/extensions.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/content/extensions.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/content/extensions.js	2019-09-15 11:33:31.000000000 +0000
@@ -189,7 +189,7 @@
   // Allow passing in a view through the window arguments
   if (
     "arguments" in window &&
-    window.arguments.length > 0 &&
+    !!window.arguments.length &&
     window.arguments[0] !== null &&
     "view" in window.arguments[0]
   ) {
@@ -654,6 +654,11 @@
   currentViewId: "",
   currentViewObj: null,
   currentViewRequest: 0,
+  // All historyEntryId values must be unique within one session, because the
+  // IDs are used to map history entries to page state. It is not possible to
+  // see whether a historyEntryId was used in history entries before this page
+  // was loaded, so start counting from a random value to avoid collisions.
+  nextHistoryEntryId: Math.floor(Math.random() * 2 ** 32),
   viewObjects: {},
   viewChangeCallback: null,
   initialViewSelected: false,
@@ -766,6 +771,7 @@
     var state = {
       view: aViewId,
       previousView: this.currentViewId,
+      historyEntryId: ++this.nextHistoryEntryId,
       isKeyboardNavigation,
     };
     if (!isRefresh) {
@@ -785,6 +791,7 @@
     var state = {
       view: aViewId,
       previousView: null,
+      historyEntryId: ++this.nextHistoryEntryId,
     };
     gHistory.replaceState(state);
     this.loadViewInternal(aViewId, null, state);
@@ -794,6 +801,7 @@
     var state = {
       view: aViewId,
       previousView: null,
+      historyEntryId: ++this.nextHistoryEntryId,
     };
     gHistory.replaceState(state);
 
@@ -1458,7 +1466,7 @@
 
       gPendingInitializations++;
       getAddonsAndInstalls(aType.id, (aAddonsList, aInstallsList) => {
-        var hidden = aAddonsList.length == 0 && aInstallsList.length == 0;
+        var hidden = !aAddonsList.length && !aInstallsList.length;
         var item = this.get(aViewId);
 
         // Don't load view that is becoming hidden
@@ -1469,7 +1477,7 @@
         item.hidden = hidden;
         Services.prefs.setBoolPref(prefName, hidden);
 
-        if (aAddonsList.length > 0 || aInstallsList.length > 0) {
+        if (aAddonsList.length || aInstallsList.length) {
           notifyInitialized();
           return;
         }
@@ -1578,7 +1586,7 @@
 
     this._search.addEventListener("command", function(aEvent) {
       var query = aEvent.target.value;
-      if (query.length == 0) {
+      if (!query.length) {
         return;
       }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/content/shortcuts.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/content/shortcuts.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/content/shortcuts.js	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/content/shortcuts.js	2019-09-15 11:33:32.000000000 +0000
@@ -201,7 +201,7 @@
     let modifiers = shortcut.split("+");
     let key = modifiers.pop();
 
-    if (modifiers.length > 0) {
+    if (modifiers.length) {
       let modifiersAttribute = ShortcutUtils.getModifiersAttribute(modifiers);
       let displayString =
         ShortcutUtils.getModifierString(modifiersAttribute) + key;
@@ -404,7 +404,7 @@
     let shortcutString = getShortcutForEvent(e);
     input.value = getShortcutValue(shortcutString);
 
-    if (e.type == "keyup" || shortcutString.length == 0) {
+    if (e.type == "keyup" || !shortcutString.length) {
       return;
     }
 
@@ -608,7 +608,7 @@
       }
     }
 
-    if (noShortcutAddons.length > 0) {
+    if (noShortcutAddons.length) {
       frag.appendChild(renderNoShortcutAddons(noShortcutAddons));
     }
 
@@ -632,7 +632,7 @@
         .sort((a, b) => a.name.localeCompare(b.name));
       let frag;
 
-      if (addons.length > 0) {
+      if (addons.length) {
         frag = await renderAddons(addons);
       } else {
         frag = document.importNode(templates.noAddons.content, true);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/internal/AddonRepository.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/internal/AddonRepository.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/internal/AddonRepository.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/internal/AddonRepository.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -576,7 +576,7 @@
     let ids = await getAddonsToCache(aIds);
 
     // If there are no add-ons to cache, act as if caching is disabled
-    if (ids.length == 0) {
+    if (!ids.length) {
       return [];
     }
 
@@ -607,7 +607,7 @@
     let addonsToCache = await getAddonsToCache(ids);
 
     // Completely remove cache if there are no add-ons to cache
-    if (addonsToCache.length == 0) {
+    if (!addonsToCache.length) {
       logger.debug("Clearing cache because 0 add-ons were requested");
       await this._clearCache();
       return;
@@ -672,7 +672,7 @@
       let authors = aEntry.authors.map(
         author => new AddonManagerPrivate.AddonAuthor(author.name, author.url)
       );
-      if (authors.length > 0) {
+      if (authors.length) {
         addon.creator = authors[0];
         addon.developers = authors.slice(1);
       }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/internal/GMPProvider.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/internal/GMPProvider.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/internal/GMPProvider.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/internal/GMPProvider.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -447,7 +447,7 @@
   },
 
   get isInstalled() {
-    return this.version && this.version.length > 0;
+    return this.version && !!this.version.length;
   },
 
   _handleEnabledChanged() {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/internal/XPIDatabase.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/internal/XPIDatabase.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/internal/XPIDatabase.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/internal/XPIDatabase.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -458,7 +458,7 @@
   }
 
   get isPlatformCompatible() {
-    if (this.targetPlatforms.length == 0) {
+    if (!this.targetPlatforms.length) {
       return true;
     }
 
@@ -901,7 +901,7 @@
     let repositoryAddon = addon._repositoryAddon;
     if (repositoryAddon && "screenshots" in repositoryAddon) {
       let repositoryScreenshots = repositoryAddon.screenshots;
-      if (repositoryScreenshots && repositoryScreenshots.length > 0) {
+      if (repositoryScreenshots && repositoryScreenshots.length) {
         return repositoryScreenshots;
       }
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/internal/XPIInstall.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/internal/XPIInstall.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/internal/XPIInstall.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/internal/XPIInstall.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -456,10 +456,11 @@
 
   // Read the list of available locales, and pre-load messages for
   // all locales.
-  let locales =
-    extension.errors.length == 0 ? await extension.initAllLocales() : null;
+  let locales = !extension.errors.length
+    ? await extension.initAllLocales()
+    : null;
 
-  if (extension.errors.length > 0) {
+  if (extension.errors.length) {
     let error = new Error("Extension is invalid");
     // Add detailed errors on the error object so that the front end can display them
     // if needed (eg in about:debugging).
@@ -1170,7 +1171,7 @@
    * state
    */
   rollback() {
-    while (this._installedFiles.length > 0) {
+    while (this._installedFiles.length) {
       let move = this._installedFiles.pop();
       if (move.isMoveTo) {
         move.newFile.moveTo(move.oldDir.parent, move.oldDir.leafName);
@@ -1185,7 +1186,7 @@
       }
     }
 
-    while (this._createdDirs.length > 0) {
+    while (this._createdDirs.length) {
       recursiveRemove(this._createdDirs.pop());
     }
   },
@@ -3576,7 +3577,7 @@
         AddonManagerPrivate.hasUpgradeListener(addon.id)
       );
 
-      if (blockers.length > 0) {
+      if (blockers.length) {
         await waitForAllPromises(installs.map(postponeAddon));
       } else {
         await waitForAllPromises(installs.map(installAddon));
@@ -3730,7 +3731,7 @@
 
   cancelAll() {
     // Cancelling one may alter _inProgress, so don't use a simple iterator
-    while (this._inProgress.length > 0) {
+    while (this._inProgress.length) {
       let c = this._inProgress.shift();
       try {
         c.cancel();
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/internal/XPIProvider.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/internal/XPIProvider.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/internal/XPIProvider.jsm	2019-09-15 11:33:31.000000000 +0000
@@ -2914,7 +2914,7 @@
       let extensionListChanged = false;
       // If the database needs to be updated then open it and then update it
       // from the filesystem
-      if (updateReasons.length > 0) {
+      if (updateReasons.length) {
         AddonManagerPrivate.recordSimpleMeasure(
           "XPIDB_startup_load_reasons",
           updateReasons
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_html_abuse_report.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_html_abuse_report.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_html_abuse_report.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_html_abuse_report.js	2019-09-15 11:33:30.000000000 +0000
@@ -599,7 +599,7 @@
   const allButtons = Array.from(reportPanel.querySelectorAll("button")).filter(
     el => el !== reportPanel._iconClose
   );
-  ok(allButtons.length > 0, "panel buttons should have been found");
+  ok(!!allButtons.length, "panel buttons should have been found");
   ok(
     allButtons.every(el => el.hasAttribute("data-l10n-id")),
     "All the panel buttons have a data-l10n-id"
@@ -917,7 +917,7 @@
     );
     if (reasonInfo.hasSuggestions) {
       ok(
-        localizedSuggestionsContent.length > 0,
+        !!localizedSuggestionsContent.length,
         `Category suggestions should not be empty for "${reason}"`
       );
     } else {
@@ -943,7 +943,7 @@
       learnMoreLinks.push(..._suggestions.querySelectorAll(linkClass));
     }
 
-    if (learnMoreLinks.length > 0) {
+    if (learnMoreLinks.length) {
       ok(
         learnMoreLinks.every(el => el.getAttribute("target") === "_blank"),
         "All the learn more links have target _blank"
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_html_list_view.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_html_list_view.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_html_list_view.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_html_list_view.js	2019-09-15 11:33:31.000000000 +0000
@@ -25,7 +25,7 @@
 }
 
 function isEmpty(el) {
-  return el.children.length == 0;
+  return !el.children.length;
 }
 
 function waitForThemeChange(list) {
@@ -775,7 +775,7 @@
 
   // Check that the icons are set to the plugin icon.
   let icons = doc.querySelectorAll(".card-heading-icon");
-  ok(icons.length > 0, "There are some plugins listed");
+  ok(!!icons.length, "There are some plugins listed");
 
   for (let icon of icons) {
     is(icon.src, pluginIconUrl, "Plugins use the plugin icon");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_html_list_view_recommendations.js	2019-09-15 11:33:31.000000000 +0000
@@ -140,7 +140,7 @@
 
   // Check that the cards are all for the right type.
   let cards = doc.querySelectorAll("recommended-addon-card");
-  ok(cards.length > 0, "There were some cards found");
+  ok(!!cards.length, "There were some cards found");
   for (let card of cards) {
     is(card.discoAddon.type, type, `The card is for a ${type}`);
     is_element_visible(card, "The card is visible");
@@ -183,7 +183,7 @@
   is(hiddenCard.addonId, addonId, "The expected card was found");
   is_element_hidden(hiddenCard, "The card is still hidden");
 
-  ok(cards.length > 0, "There are still some visible cards");
+  ok(!!cards.length, "There are still some visible cards");
   for (let card of cards) {
     is(card.discoAddon.type, type, `The card is for a ${type}`);
     is_element_visible(card, "The card is visible");
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_html_scroll_restoration.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_html_scroll_restoration.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_html_scroll_restoration.js	1970-01-01 00:00:00.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_html_scroll_restoration.js	2019-09-15 11:33:31.000000000 +0000
@@ -0,0 +1,226 @@
+/* eslint max-len: ["error", 80] */
+"use strict";
+
+const { AddonTestUtils } = ChromeUtils.import(
+  "resource://testing-common/AddonTestUtils.jsm"
+);
+
+AddonTestUtils.initMochitest(this);
+const server = AddonTestUtils.createHttpServer();
+const TEST_API_URL = `http://localhost:${server.identity.primaryPort}/discoapi`;
+
+const EXT_ID_EXTENSION = "extension@example.com";
+const EXT_ID_THEME = "theme@example.com";
+
+let requestCount = 0;
+server.registerPathHandler("/discoapi", (request, response) => {
+  // This test is expected to load the results only once, and then cache the
+  // results.
+  is(++requestCount, 1, "Expect only one discoapi request");
+
+  let results = {
+    results: [
+      {
+        addon: {
+          authors: [{ name: "Some author" }],
+          current_version: {
+            files: [{ platform: "all", url: "data:," }],
+          },
+          url: "data:,",
+          guid: "recommendation@example.com",
+          type: "extension",
+        },
+      },
+    ],
+  };
+  response.write(JSON.stringify(results));
+});
+
+add_task(async function setup() {
+  await SpecialPowers.pushPrefEnv({
+    set: [["extensions.getAddons.discovery.api_url", TEST_API_URL]],
+  });
+
+  let mockProvider = new MockProvider();
+  mockProvider.createAddons([
+    {
+      id: EXT_ID_EXTENSION,
+      name: "Mock 1",
+      type: "extension",
+      userPermissions: {
+        origins: ["<all_urls>"],
+        permissions: ["tabs"],
+      },
+    },
+    {
+      id: EXT_ID_THEME,
+      name: "Mock 2",
+      type: "theme",
+    },
+  ]);
+});
+
+async function switchToView(win, type, param = "") {
+  let loaded = waitForViewLoad(win);
+  win.managerWindow.gViewController.loadView(`addons://${type}/${param}`);
+  await loaded;
+  await waitForStableLayout(win);
+}
+
+// delta = -1 = go back.
+// delta = +1 = go forwards.
+async function historyGo(win, delta, expectedViewType) {
+  let loaded = waitForViewLoad(win);
+  win.managerWindow.history.go(delta);
+  await loaded;
+  is(
+    win.managerWindow.gViewController.currentViewId,
+    expectedViewType,
+    "Expected view after history navigation"
+  );
+  await waitForStableLayout(win);
+}
+
+async function waitForStableLayout(win) {
+  // In the test, it is important that the layout is fully stable before we
+  // consider the view loaded, because those affect the offset calculations.
+  await TestUtils.waitForCondition(
+    () => isLayoutStable(win),
+    "Waiting for layout to stabilize"
+  );
+}
+
+function isLayoutStable(win) {
+  // <message-bar> elements may affect the layout of a page, and therefore we
+  // should check whether its embedded style sheet has finished loading.
+  for (let bar of win.document.querySelectorAll("message-bar")) {
+    // Check for the existence of a CSS property from message-bar.css.
+    if (!win.getComputedStyle(bar).getPropertyValue("--message-bar-icon-url")) {
+      return false;
+    }
+  }
+  return true;
+}
+
+function getAddonCard(win, addonId) {
+  return win.document.querySelector(`addon-card[addon-id="${addonId}"]`);
+}
+
+function getScrollOffset(win) {
+  let { scrollTop: top, scrollLeft: left } = win.document.documentElement;
+  return { top, left };
+}
+
+// Scroll an element into view. The purpose of this is to simulate a real-world
+// scenario where the user has moved part of the UI is in the viewport.
+function scrollTopLeftIntoView(elem) {
+  elem.scrollIntoView({ block: "start", inline: "start" });
+  // Sanity check: In this test, a large padding has been added to the top and
+  // left of the document. So when an element has been scrolled into view, the
+  // top and left offsets must be non-zero.
+  assertNonZeroScrollOffsets(getScrollOffset(elem.ownerGlobal));
+}
+
+function assertNonZeroScrollOffsets(offsets) {
+  ok(offsets.left, "Should have scrolled to the right");
+  ok(offsets.top, "Should have scrolled down");
+}
+
+function checkScrollOffset(win, expected, msg = "") {
+  let actual = getScrollOffset(win);
+  is(actual.top, expected.top, `Top scroll offset - ${msg}`);
+  is(actual.left, expected.left, `Left scroll offset - ${msg}`);
+}
+
+add_task(async function test_scroll_restoration() {
+  let win = await loadInitialView("discover");
+
+  // Wait until the recommendations have been loaded. These are cached after
+  // the first load, so we only need to wait once, at the start of the test.
+  await win.document.querySelector("recommended-addon-list").cardsReady;
+
+  // Force scrollbar to appear, by adding enough space at the top and left.
+  win.document.body.style.paddingTop = "200vh";
+  win.document.body.style.paddingLeft = "100vw";
+  win.document.body.style.width = "200vw";
+
+  checkScrollOffset(win, { top: 0, left: 0 }, "initial page load");
+
+  scrollTopLeftIntoView(win.document.querySelector("recommended-addon-card"));
+  let discoOffsets = getScrollOffset(win);
+  assertNonZeroScrollOffsets(discoOffsets);
+
+  // Switch from disco pane to extension list
+
+  await switchToView(win, "list", "extension");
+  checkScrollOffset(win, { top: 0, left: 0 }, "initial extension list");
+
+  scrollTopLeftIntoView(getAddonCard(win, EXT_ID_EXTENSION));
+  let extListOffsets = getScrollOffset(win);
+  assertNonZeroScrollOffsets(extListOffsets);
+
+  // Switch from extension list to details view.
+
+  let loaded = waitForViewLoad(win);
+  getAddonCard(win, EXT_ID_EXTENSION).click();
+  await loaded;
+
+  checkScrollOffset(win, { top: 0, left: 0 }, "initial details view");
+  scrollTopLeftIntoView(getAddonCard(win, EXT_ID_EXTENSION));
+  let detailsOffsets = getScrollOffset(win);
+  assertNonZeroScrollOffsets(detailsOffsets);
+
+  // Switch from details view back to extension list.
+
+  await historyGo(win, -1, "addons://list/extension");
+  checkScrollOffset(win, extListOffsets, "back to extension list");
+
+  // Now scroll to the bottom-right corner, so we can check whether the scroll
+  // offset is correctly restored when the extension view is loaded, even when
+  // the recommendations are loaded after the initial render.
+  ok(
+    win.document.querySelector("recommended-addon-card"),
+    "Recommendations have already been loaded"
+  );
+  win.document.body.scrollIntoView({ block: "end", inline: "end" });
+  extListOffsets = getScrollOffset(win);
+  assertNonZeroScrollOffsets(extListOffsets);
+
+  // Switch back from the extension list to the details view.
+
+  await historyGo(win, +1, `addons://detail/${EXT_ID_EXTENSION}`);
+  checkScrollOffset(win, detailsOffsets, "details view with default tab");
+
+  // Switch from the default details tab to the permissions tab.
+  // (this does not change the history).
+  win.document.querySelector("named-deck-button[name='permissions']").click();
+
+  // Switch back from the details view to the extension list.
+
+  await historyGo(win, -1, "addons://list/extension");
+  checkScrollOffset(win, extListOffsets, "bottom-right of extension list");
+  ok(
+    win.document.querySelector("recommended-addon-card"),
+    "Recommendations should have been loaded again"
+  );
+
+  // Switch back from extension list to the details view.
+
+  await historyGo(win, +1, `addons://detail/${EXT_ID_EXTENSION}`);
+  // Scroll offsets are not remembered for the details view, because at the
+  // time of leaving the details view, the non-default tab was selected.
+  checkScrollOffset(win, { top: 0, left: 0 }, "details view, non-default tab");
+
+  // Switch back from the details view to the disco pane.
+
+  await historyGo(win, -2, "addons://discover/");
+  checkScrollOffset(win, discoOffsets, "after switching back to disco pane");
+
+  // Switch from disco pane to theme list.
+
+  // Verifies that the extension list and theme lists are independent.
+  await switchToView(win, "list", "theme");
+  checkScrollOffset(win, { top: 0, left: 0 }, "initial theme list");
+
+  await closeView(win);
+});
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser.ini firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser.ini
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser.ini	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser.ini	2019-09-15 11:33:31.000000000 +0000
@@ -83,6 +83,7 @@
 skip-if = (os == 'win' && processor == 'aarch64') # aarch64 has no plugin support, bug 1525174 and 1547495
 [browser_html_recent_updates.js]
 [browser_html_recommendations.js]
+[browser_html_scroll_restoration.js]
 [browser_html_updates.js]
 [browser_html_warning_messages.js]
 [browser_installssl.js]
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_installssl.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_installssl.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_installssl.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_installssl.js	2019-09-15 11:33:30.000000000 +0000
@@ -67,7 +67,7 @@
 
 function run_install_tests(callback) {
   async function run_next_install_test() {
-    if (gTests.length == 0) {
+    if (!gTests.length) {
       callback();
       return;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_updatessl.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_updatessl.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_updatessl.js	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_updatessl.js	2019-09-15 11:33:31.000000000 +0000
@@ -88,7 +88,7 @@
 
 function run_update_tests(callback) {
   function run_next_update_test() {
-    if (gTests.length == 0) {
+    if (!gTests.length) {
       callback();
       return;
     }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/browser_webapi_install.js	2019-09-15 11:33:32.000000000 +0000
@@ -140,7 +140,7 @@
         });
       }
 
-      while (steps.length > 0) {
+      while (steps.length) {
         let nextStep = steps.shift();
         if (nextStep.action) {
           if (nextStep.action == "install") {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/head.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/head.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/browser/head.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/browser/head.js	2019-09-15 11:33:31.000000000 +0000
@@ -230,7 +230,7 @@
     info("Test " + gTestsRun + " took " + (Date.now() - gTestStart) + "ms");
   }
 
-  if (gPendingTests.length == 0) {
+  if (!gPendingTests.length) {
     executeSoon(end_test);
     return;
   }
@@ -503,7 +503,7 @@
   var bundle = Services.strings.createBundle(
     "chrome://mozapps/locale/extensions/extensions.properties"
   );
-  if (aArgs.length == 0) {
+  if (!aArgs.length) {
     return bundle.GetStringFromName(aName);
   }
   return bundle.formatStringFromName(aName, aArgs);
@@ -799,7 +799,7 @@
    */
   addAddon: function MP_addAddon(aAddon) {
     var oldAddons = this.addons.filter(aOldAddon => aOldAddon.id == aAddon.id);
-    var oldAddon = oldAddons.length > 0 ? oldAddons[0] : null;
+    var oldAddon = oldAddons.length ? oldAddons[0] : null;
 
     this.addons = this.addons.filter(aOldAddon => aOldAddon.id != aAddon.id);
 
@@ -973,7 +973,7 @@
         "MockProvider: pending callbacks at shutdown(): calling immediately"
       );
     }
-    while (this.callbackTimers.length > 0) {
+    while (this.callbackTimers.length) {
       // When we notify the callback timer, it removes itself from our array
       let timer = this.callbackTimers[0];
       try {
@@ -1015,7 +1015,7 @@
    */
   async getAddonsByTypes(aTypes) {
     var addons = this.addons.filter(function(aAddon) {
-      if (aTypes && aTypes.length > 0 && !aTypes.includes(aAddon.type)) {
+      if (aTypes && !!aTypes.length && !aTypes.includes(aAddon.type)) {
         return false;
       }
       return true;
@@ -1036,7 +1036,7 @@
         return false;
       }
 
-      if (aTypes && aTypes.length > 0 && !aTypes.includes(aInstall.type)) {
+      if (aTypes && !!aTypes.length && !aTypes.includes(aInstall.type)) {
         return false;
       }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/xpcshell/head_addons.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/xpcshell/head_addons.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/xpcshell/head_addons.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/xpcshell/head_addons.js	2019-09-15 11:33:32.000000000 +0000
@@ -874,7 +874,7 @@
     }
 
     let events = this.expectedEvents[aId];
-    Assert.ok(events.length > 0, `Should be expecting events for ${aId}`);
+    Assert.ok(!!events.length, `Should be expecting events for ${aId}`);
 
     return events.shift();
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/xpcshell/test_addon_manager_telemetry_events.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/xpcshell/test_addon_manager_telemetry_events.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/xpcshell/test_addon_manager_telemetry_events.js	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/xpcshell/test_addon_manager_telemetry_events.js	2019-09-15 11:33:31.000000000 +0000
@@ -26,7 +26,7 @@
   );
 
   ok(
-    snapshot.parent && snapshot.parent.length > 0,
+    snapshot.parent && !!snapshot.parent.length,
     "Got parent telemetry events in the snapshot"
   );
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/xpcshell/test_plugins.js	2019-09-15 11:33:30.000000000 +0000
@@ -81,7 +81,7 @@
   Assert.notEqual(testPlugin, null);
 
   let addons = await AddonManager.getAddonsByTypes(["plugin"]);
-  Assert.ok(addons.length > 0);
+  Assert.ok(!!addons.length);
 
   addons.forEach(function(p) {
     if (p.description == TEST_PLUGIN_DESCRIPTION) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/xpcshell/test_pref_properties.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/xpcshell/test_pref_properties.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/extensions/test/xpcshell/test_pref_properties.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/extensions/test/xpcshell/test_pref_properties.js	2019-09-15 11:33:32.000000000 +0000
@@ -30,7 +30,7 @@
   },
   checkExpected() {
     info("Checking expected events...");
-    while (this.expectedEvents.length > 0) {
+    while (this.expectedEvents.length) {
       let event = this.expectedEvents.pop();
       info("Looking for expected event " + event);
       let matchingEvents = this.seenEvents.filter(function(aSeenEvent) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/installer/find-dupes.py firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/installer/find-dupes.py
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/installer/find-dupes.py	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/installer/find-dupes.py	2019-09-15 11:33:30.000000000 +0000
@@ -2,6 +2,8 @@
 # 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/.
 
+from __future__ import print_function
+
 import sys
 import hashlib
 import re
@@ -68,10 +70,10 @@
     for m, (size, compressed, paths) in sorted(md5s.iteritems(),
                                                key=lambda x: x[1][1]):
         if len(paths) > 1:
-            print 'Duplicates %d bytes%s%s:' % (size,
-                  ' (%d compressed)' % compressed if compressed != size else '',
-                  ' (%d times)' % (len(paths) - 1) if len(paths) > 2 else '')
-            print ''.join('  %s\n' % p for p in paths)
+            _compressed = ' (%d compressed)' % compressed if compressed != size else ''
+            _times = ' (%d times)' % (len(paths) - 1) if len(paths) > 2 else ''
+            print('Duplicates {} bytes{}{}:'.format(size, _compressed, _times))
+            print(''.join('  %s\n' % p for p in paths))
             total += (len(paths) - 1) * size
             total_compressed += (len(paths) - 1) * compressed
             num_dupes += 1
@@ -81,15 +83,15 @@
                     unexpected_dupes.append(p)
 
     if num_dupes:
-        print "WARNING: Found %d duplicated files taking %d bytes (%s)" % \
-              (num_dupes, total,
-               '%d compressed' % total_compressed if total_compressed != total
-                                                  else 'uncompressed')
+        total_compressed = '%d compressed' % total_compressed \
+            if total_compressed != total else 'uncompressed'
+        print("WARNING: Found {} duplicated files taking {} bytes ({})".format(
+            num_dupes, total, total_compressed))
 
     if unexpected_dupes:
         errortype = "ERROR" if bail else "WARNING"
-        print "%s: The following duplicated files are not allowed:" % errortype
-        print "\n".join(unexpected_dupes)
+        print("{}: The following duplicated files are not allowed:".format(errortype))
+        print("\n".join(unexpected_dupes))
         if bail:
             sys.exit(1)
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/preferences/fontbuilder.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/preferences/fontbuilder.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/preferences/fontbuilder.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/preferences/fontbuilder.js	2019-09-15 11:33:32.000000000 +0000
@@ -28,11 +28,11 @@
     let defaultFont = null;
     // Load Font Lists
     let fonts = await this.enumerator.EnumerateFontsAsync(aLanguage, aFontType);
-    if (fonts.length > 0) {
+    if (fonts.length) {
       defaultFont = this.enumerator.getDefaultFont(aLanguage, aFontType);
     } else {
       fonts = await this.enumerator.EnumerateFontsAsync(aLanguage, "");
-      if (fonts.length > 0) {
+      if (fonts.length) {
         defaultFont = this.enumerator.getDefaultFont(aLanguage, "");
       }
     }
@@ -44,7 +44,7 @@
     // Build the UI for the Default Font and Fonts for this CSS type.
     const popup = document.createXULElement("menupopup");
     let separator;
-    if (fonts.length > 0) {
+    if (fonts.length) {
       let menuitem = document.createXULElement("menuitem");
       if (defaultFont) {
         document.l10n.setAttributes(menuitem, "fonts-label-default", {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/update/tests/data/sharedUpdateXML.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/update/tests/data/sharedUpdateXML.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/update/tests/data/sharedUpdateXML.js	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/update/tests/data/sharedUpdateXML.js	2019-09-15 11:33:31.000000000 +0000
@@ -395,7 +395,7 @@
     let bytes = bis.readByteArray(Math.min(65535, count));
     data.push(String.fromCharCode.apply(null, bytes));
     count -= bytes.length;
-    if (bytes.length == 0) {
+    if (!bytes.length) {
       throw new Error("Nothing read from input stream!");
     }
   }
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/update/tests/data/xpcshellUtilsAUS.js	2019-09-15 11:33:31.000000000 +0000
@@ -854,7 +854,7 @@
     .split(".")[0];
 
   if (gDebugTestLog && !gIsServiceTest) {
-    if (gTestsToLog.length == 0 || gTestsToLog.includes(gTestID)) {
+    if (!gTestsToLog.length || gTestsToLog.includes(gTestID)) {
       let logFile = do_get_file(gTestID + ".log", true);
       if (!logFile.exists()) {
         logFile.create(Ci.nsIFile.NORMAL_FILE_TYPE, PERMS_FILE);
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/update/UpdateService.jsm firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/update/UpdateService.jsm
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/mozapps/update/UpdateService.jsm	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/mozapps/update/UpdateService.jsm	2019-09-15 11:33:30.000000000 +0000
@@ -1313,7 +1313,7 @@
   let suffix = patchType + "_" + (aStartup ? AUSTLMY.STARTUP : AUSTLMY.STAGE);
   let stateCode = 0;
   let parts = aStatus.split(":");
-  if (parts.length > 0) {
+  if (parts.length) {
     switch (parts[0]) {
       case STATE_NONE:
         stateCode = 2;
@@ -1732,7 +1732,7 @@
     this._patches.push(patch);
   }
 
-  if (this._patches.length == 0 && !update.hasAttribute("unsupported")) {
+  if (!this._patches.length && !update.hasAttribute("unsupported")) {
     throw Cr.NS_ERROR_ILLEGAL_VALUE;
   }
 
@@ -2838,7 +2838,7 @@
    * @return  The nsIUpdate to offer.
    */
   selectUpdate: function AUS_selectUpdate(updates) {
-    if (updates.length == 0) {
+    if (!updates.length) {
       AUSTLMY.pingCheckCode(this._pingSuffix, AUSTLMY.CHK_NO_UPDATE_FOUND);
       return null;
     }
@@ -3341,7 +3341,7 @@
 function UpdateManager() {
   // Load the active-update.xml file to see if there is an active update.
   let activeUpdates = this._loadXMLFileIntoArray(FILE_ACTIVE_UPDATE_XML);
-  if (activeUpdates.length > 0) {
+  if (activeUpdates.length) {
     // Set the active update directly on the var used to cache the value.
     this._activeUpdate = activeUpdates[0];
     // This check is performed here since UpdateService:_postUpdateProcessing
@@ -3396,7 +3396,7 @@
       this._activeUpdate = null;
       if (data != "skip-files") {
         let activeUpdates = this._loadXMLFileIntoArray(FILE_ACTIVE_UPDATE_XML);
-        if (activeUpdates.length > 0) {
+        if (activeUpdates.length) {
           this._activeUpdate = activeUpdates[0];
         }
         updates = this._loadXMLFileIntoArray(FILE_UPDATES_XML);
@@ -3488,7 +3488,7 @@
       );
     }
     fileStream.close();
-    if (updates.length == 0) {
+    if (!updates.length) {
       LOG(
         "UpdateManager:_loadXMLFileIntoArray - update xml file " +
           fileName +
@@ -3582,7 +3582,7 @@
       );
       return false;
     }
-    if (updates.length == 0) {
+    if (!updates.length) {
       LOG(
         "UpdateManager:_writeUpdatesToXMLFile - no updates to write. " +
           "removing file: " +
@@ -4758,7 +4758,7 @@
         this._listeners.splice(i, 1);
 
         // Decrease the status update frequency when no one is listening
-        if (this._listeners.length == 0) {
+        if (!this._listeners.length) {
           this._maybeStopActiveNotifications();
         }
         return;
@@ -4770,7 +4770,7 @@
    * Returns a boolean indicating whether there are any download listeners
    */
   get hasDownloadListeners() {
-    return this._listeners.length > 0;
+    return !!this._listeners.length;
   },
 
   /**
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/recordreplay/ipc/Channel.cpp firefox-trunk-71.0~a1~hg20190915r493291/toolkit/recordreplay/ipc/Channel.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/recordreplay/ipc/Channel.cpp	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/recordreplay/ipc/Channel.cpp	2019-09-15 11:33:31.000000000 +0000
@@ -246,6 +246,13 @@
     aMsg.mReceiveTime = (receiveTime - mStartTime).ToMilliseconds();
   }
 
+  // Send messages atomically, except when crashing.
+  Maybe<MonitorAutoLock> lock;
+  if (aMsg.mType != MessageType::BeginFatalError &&
+      aMsg.mType != MessageType::FatalError) {
+    lock.emplace(mMonitor);
+  }
+
   const char* ptr = (const char*)&aMsg;
   size_t nbytes = aMsg.mSize;
   while (nbytes) {
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/recordreplay/ipc/Channel.h firefox-trunk-71.0~a1~hg20190915r493291/toolkit/recordreplay/ipc/Channel.h
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/recordreplay/ipc/Channel.h	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/recordreplay/ipc/Channel.h	2019-09-15 11:33:31.000000000 +0000
@@ -315,7 +315,7 @@
   // Descriptor used to communicate with the other side.
   int mFd;
 
-  // For synchronizing initialization of the channel.
+  // For synchronizing initialization of the channel and ensuring atomic sends.
   Monitor mMonitor;
 
   // Buffer for message data received from the other side of the channel.
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/recordreplay/ProcessRedirectDarwin.cpp firefox-trunk-71.0~a1~hg20190915r493291/toolkit/recordreplay/ProcessRedirectDarwin.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/recordreplay/ProcessRedirectDarwin.cpp	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/recordreplay/ProcessRedirectDarwin.cpp	2019-09-15 11:33:31.000000000 +0000
@@ -2566,6 +2566,7 @@
     {"SCDynamicStoreCreateRunLoopSource", RR_ScalarRval},
     {"SCDynamicStoreKeyCreateProxies", RR_ScalarRval},
     {"SCDynamicStoreSetNotificationKeys", RR_ScalarRval},
+    {"SecRandomCopyBytes", RR_SaveRvalHadErrorNegative<RR_WriteBuffer<2, 1>>},
     {"SendEventToEventTarget", RR_ScalarRval},
 
     // These are not public APIs, but other redirected functions may be aliases
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/toolkit/xre/test/test_install_hash.js firefox-trunk-71.0~a1~hg20190915r493291/toolkit/xre/test/test_install_hash.js
--- firefox-trunk-71.0~a1~hg20190913r492975/toolkit/xre/test/test_install_hash.js	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/toolkit/xre/test/test_install_hash.js	2019-09-15 11:33:31.000000000 +0000
@@ -50,7 +50,7 @@
     path = path.parent;
   }
 
-  while (parts.length > 0) {
+  while (parts.length) {
     path.append(parts.pop());
   }
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/infer/test/autotest/src/main/java/Biabduction.json firefox-trunk-71.0~a1~hg20190915r493291/tools/infer/test/autotest/src/main/java/Biabduction.json
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/infer/test/autotest/src/main/java/Biabduction.json	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/infer/test/autotest/src/main/java/Biabduction.json	2019-09-15 11:33:31.000000000 +0000
@@ -1,114 +1 @@
-[
-    {
-        "bug_class": "PROVER",
-        "bug_trace": [
-            {
-                "column_number": -1,
-                "description": "start of procedure f1()",
-                "filename": "autotest/src/main/java/Biabduction.java",
-                "level": 0,
-                "line_number": 11
-            },
-            {
-                "column_number": -1,
-                "description": "",
-                "filename": "autotest/src/main/java/Biabduction.java",
-                "level": 0,
-                "line_number": 12
-            },
-            {
-                "column_number": -1,
-                "description": "start of procedure get()",
-                "filename": "autotest/src/main/java/Biabduction.java",
-                "level": 1,
-                "line_number": 9
-            },
-            {
-                "column_number": -1,
-                "description": "return from a call to String Biabduction.get()",
-                "filename": "autotest/src/main/java/Biabduction.java",
-                "level": 1,
-                "line_number": 9
-            },
-            {
-                "column_number": -1,
-                "description": "",
-                "filename": "autotest/src/main/java/Biabduction.java",
-                "level": 0,
-                "line_number": 12
-            }
-        ],
-        "bug_type": "NULL_DEREFERENCE",
-        "bug_type_hum": "Null Dereference",
-        "censored_reason": "",
-        "column": -1,
-        "file": "autotest/src/main/java/Biabduction.java",
-        "hash": "918d7eaedf45f651f04c55554c72478c",
-        "key": "Biabduction.java|f1|NULL_DEREFERENCE",
-        "kind": "ERROR",
-        "line": 12,
-        "node_key": "9afcdcc9d4253c36267a0d34b98c337d",
-        "procedure": "void Biabduction.f1()",
-        "procedure_id": "Biabduction.f1():void.4b49520e7621606a0d5661886ff0b098",
-        "procedure_start_line": 11,
-        "qualifier": "object returned by `get(this)` could be null and is dereferenced at line 12.",
-        "severity": "HIGH",
-        "visibility": "user"
-    },
-    {
-        "bug_class": "PROVER",
-        "bug_trace": [
-            {
-                "column_number": -1,
-                "description": "start of procedure f2()",
-                "filename": "autotest/src/main/java/Biabduction.java",
-                "level": 0,
-                "line_number": 15
-            },
-            {
-                "column_number": -1,
-                "description": "",
-                "filename": "autotest/src/main/java/Biabduction.java",
-                "level": 0,
-                "line_number": 17
-            },
-            {
-                "column_number": -1,
-                "description": "start of procedure get()",
-                "filename": "autotest/src/main/java/Biabduction.java",
-                "level": 1,
-                "line_number": 9
-            },
-            {
-                "column_number": -1,
-                "description": "return from a call to String Biabduction.get()",
-                "filename": "autotest/src/main/java/Biabduction.java",
-                "level": 1,
-                "line_number": 9
-            },
-            {
-                "column_number": -1,
-                "description": "",
-                "filename": "autotest/src/main/java/Biabduction.java",
-                "level": 0,
-                "line_number": 17
-            }
-        ],
-        "bug_type": "NULL_DEREFERENCE",
-        "bug_type_hum": "Null Dereference",
-        "censored_reason": "",
-        "column": -1,
-        "file": "autotest/src/main/java/Biabduction.java",
-        "hash": "bc952ce8bad58dac5cb6672dc3150524",
-        "key": "Biabduction.java|f2|NULL_DEREFERENCE",
-        "kind": "ERROR",
-        "line": 17,
-        "node_key": "9afcdcc9d4253c36267a0d34b98c337d",
-        "procedure": "void Biabduction.f2()",
-        "procedure_id": "Biabduction.f2():void.41c05a632eb912a458482c1e2e4dcbb4",
-        "procedure_start_line": 15,
-        "qualifier": "object returned by `get(this)` could be null and is dereferenced at line 17.",
-        "severity": "HIGH",
-        "visibility": "user"
-    }
-]
+[{"key": "Biabduction.java|f1|NULL_DEREFERENCE", "hash": "18467ae22b3a0dde943dc9dfc84d193a", "severity": "ERROR", "column": -1, "bug_type_hum": "Null Dereference", "node_key": "9afcdcc9d4253c36267a0d34b98c337d", "bug_type": "NULL_DEREFERENCE", "file": "autotest/src/main/java/Biabduction.java", "procedure_start_line": 11, "line": 12, "bug_trace": [{"line_number": 11, "filename": "autotest/src/main/java/Biabduction.java", "description": "start of procedure f1()", "column_number": -1, "level": 0}, {"line_number": 12, "filename": "autotest/src/main/java/Biabduction.java", "description": "", "column_number": -1, "level": 0}, {"line_number": 9, "filename": "autotest/src/main/java/Biabduction.java", "description": "start of procedure get()", "column_number": -1, "level": 1}, {"line_number": 9, "filename": "autotest/src/main/java/Biabduction.java", "description": "return from a call to String Biabduction.get()", "column_number": -1, "level": 1}, {"line_number": 12, "filename": "autotest/src/main/java/Biabduction.java", "description": "", "column_number": -1, "level": 0}], "procedure": "Biabduction.f1():void", "qualifier": "object returned by `get(this)` could be null and is dereferenced at line 12."}, {"key": "Biabduction.java|f2|NULL_DEREFERENCE", "hash": "d2f31f10d3c48ee63c61f52f4f83de4c", "severity": "ERROR", "column": -1, "bug_type_hum": "Null Dereference", "node_key": "9afcdcc9d4253c36267a0d34b98c337d", "bug_type": "NULL_DEREFERENCE", "file": "autotest/src/main/java/Biabduction.java", "procedure_start_line": 15, "line": 17, "bug_trace": [{"line_number": 15, "filename": "autotest/src/main/java/Biabduction.java", "description": "start of procedure f2()", "column_number": -1, "level": 0}, {"line_number": 17, "filename": "autotest/src/main/java/Biabduction.java", "description": "", "column_number": -1, "level": 0}, {"line_number": 9, "filename": "autotest/src/main/java/Biabduction.java", "description": "start of procedure get()", "column_number": -1, "level": 1}, {"line_number": 9, "filename": "autotest/src/main/java/Biabduction.java", "description": "return from a call to String Biabduction.get()", "column_number": -1, "level": 1}, {"line_number": 17, "filename": "autotest/src/main/java/Biabduction.java", "description": "", "column_number": -1, "level": 0}], "procedure": "Biabduction.f2():void", "qualifier": "object returned by `get(this)` could be null and is dereferenced at line 17."}]
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/infer/test/autotest/src/main/java/Checkers.json firefox-trunk-71.0~a1~hg20190915r493291/tools/infer/test/autotest/src/main/java/Checkers.json
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/infer/test/autotest/src/main/java/Checkers.json	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/infer/test/autotest/src/main/java/Checkers.json	2019-09-15 11:33:31.000000000 +0000
@@ -1,121 +1 @@
-[
-    {
-        "bug_class": "PROVER",
-        "bug_trace": [
-            {
-                "column_number": -1,
-                "description": "start of procedure leak()",
-                "filename": "autotest/src/main/java/Checkers.java",
-                "level": 0,
-                "line_number": 10
-            },
-            {
-                "column_number": -1,
-                "description": "",
-                "filename": "autotest/src/main/java/Checkers.java",
-                "level": 0,
-                "line_number": 12
-            }
-        ],
-        "bug_type": "RESOURCE_LEAK",
-        "bug_type_hum": "Resource Leak",
-        "censored_reason": "",
-        "column": -1,
-        "file": "autotest/src/main/java/Checkers.java",
-        "hash": "56806153823413731f2e2166ed8d30a0",
-        "key": "Checkers.java|leak|RESOURCE_LEAK",
-        "kind": "ERROR",
-        "line": 12,
-        "node_key": "3a2af627d5d1f10e1994f6259cf18e4c",
-        "procedure": "void Checkers.leak()",
-        "procedure_id": "Checkers.leak():void.e21648e10d3037f4559cdb7c08642c84",
-        "procedure_start_line": 10,
-        "qualifier": "resource of type `java.io.FileReader` acquired by call to `new()` at line 12 is not released after line 12.",
-        "severity": "HIGH",
-        "visibility": "user"
-    },
-    {
-        "bug_class": "PROVER",
-        "bug_trace": [
-            {
-                "column_number": -1,
-                "description": "start of procedure error1()",
-                "filename": "autotest/src/main/java/Checkers.java",
-                "level": 0,
-                "line_number": 20
-            },
-            {
-                "column_number": -1,
-                "description": "",
-                "filename": "autotest/src/main/java/Checkers.java",
-                "level": 0,
-                "line_number": 21
-            },
-            {
-                "column_number": -1,
-                "description": "",
-                "filename": "autotest/src/main/java/Checkers.java",
-                "level": 0,
-                "line_number": 23
-            }
-        ],
-        "bug_type": "NULL_DEREFERENCE",
-        "bug_type_hum": "Null Dereference",
-        "censored_reason": "",
-        "column": -1,
-        "file": "autotest/src/main/java/Checkers.java",
-        "hash": "6de26e7c66c71b1114ad233679d55640",
-        "key": "Checkers.java|error1|NULL_DEREFERENCE",
-        "kind": "ERROR",
-        "line": 23,
-        "node_key": "c281f77c6dae544ee5fb7d5e2bb35118",
-        "procedure": "void Checkers.error1()",
-        "procedure_id": "Checkers.error1():void.59417424d80960700a32012973e98db5",
-        "procedure_start_line": 20,
-        "qualifier": "object `str` last assigned on line 21 could be null and is dereferenced at line 23.",
-        "severity": "HIGH",
-        "visibility": "user"
-    },
-    {
-        "bug_class": "PROVER",
-        "bug_trace": [
-            {
-                "column_number": -1,
-                "description": "start of procedure error2()",
-                "filename": "autotest/src/main/java/Checkers.java",
-                "level": 0,
-                "line_number": 29
-            },
-            {
-                "column_number": -1,
-                "description": "",
-                "filename": "autotest/src/main/java/Checkers.java",
-                "level": 0,
-                "line_number": 30
-            },
-            {
-                "column_number": -1,
-                "description": "",
-                "filename": "autotest/src/main/java/Checkers.java",
-                "level": 0,
-                "line_number": 31
-            }
-        ],
-        "bug_type": "NULL_DEREFERENCE",
-        "bug_type_hum": "Null Dereference",
-        "censored_reason": "",
-        "column": -1,
-        "file": "autotest/src/main/java/Checkers.java",
-        "hash": "39e021b634ab428af7be2034688491a7",
-        "key": "Checkers.java|error2|NULL_DEREFERENCE",
-        "kind": "ERROR",
-        "line": 31,
-        "node_key": "c281f77c6dae544ee5fb7d5e2bb35118",
-        "procedure": "void Checkers.error2()",
-        "procedure_id": "Checkers.error2():void.e9146d80ba20c908c11d08947cd89d06",
-        "procedure_start_line": 29,
-        "qualifier": "object `str` last assigned on line 30 could be null and is dereferenced at line 31.",
-        "severity": "HIGH",
-        "visibility": "user"
-    }
-]
+[{"key": "Checkers.java|leak|RESOURCE_LEAK", "hash": "9c8b2bb1dbffb7893fc2ae9f60f83653", "severity": "ERROR", "column": -1, "bug_type_hum": "Resource Leak", "node_key": "3a2af627d5d1f10e1994f6259cf18e4c", "bug_type": "RESOURCE_LEAK", "file": "autotest/src/main/java/Checkers.java", "procedure_start_line": 10, "line": 12, "bug_trace": [{"line_number": 10, "filename": "autotest/src/main/java/Checkers.java", "description": "start of procedure leak()", "column_number": -1, "level": 0}, {"line_number": 12, "filename": "autotest/src/main/java/Checkers.java", "description": "", "column_number": -1, "level": 0}], "procedure": "Checkers.leak():void", "qualifier": "resource of type `java.io.FileReader` acquired by call to `new()` at line 12 is not released after line 12."}, {"key": "Checkers.java|error1|NULL_DEREFERENCE", "hash": "04ff79bfff8a231ff4cdb045a76641f0", "severity": "ERROR", "column": -1, "bug_type_hum": "Null Dereference", "node_key": "c281f77c6dae544ee5fb7d5e2bb35118", "bug_type": "NULL_DEREFERENCE", "file": "autotest/src/main/java/Checkers.java", "procedure_start_line": 20, "line": 23, "bug_trace": [{"line_number": 20, "filename": "autotest/src/main/java/Checkers.java", "description": "start of procedure error1()", "column_number": -1, "level": 0}, {"line_number": 21, "filename": "autotest/src/main/java/Checkers.java", "description": "", "column_number": -1, "level": 0}, {"line_number": 23, "filename": "autotest/src/main/java/Checkers.java", "description": "", "column_number": -1, "level": 0}], "procedure": "Checkers.error1():void", "qualifier": "object `str` last assigned on line 21 could be null and is dereferenced at line 23."}, {"key": "Checkers.java|error2|NULL_DEREFERENCE", "hash": "c4fe7d68fbb6b3ea84f233de6fd3add8", "severity": "ERROR", "column": -1, "bug_type_hum": "Null Dereference", "node_key": "c281f77c6dae544ee5fb7d5e2bb35118", "bug_type": "NULL_DEREFERENCE", "file": "autotest/src/main/java/Checkers.java", "procedure_start_line": 29, "line": 31, "bug_trace": [{"line_number": 29, "filename": "autotest/src/main/java/Checkers.java", "description": "start of procedure error2()", "column_number": -1, "level": 0}, {"line_number": 30, "filename": "autotest/src/main/java/Checkers.java", "description": "", "column_number": -1, "level": 0}, {"line_number": 31, "filename": "autotest/src/main/java/Checkers.java", "description": "", "column_number": -1, "level": 0}], "procedure": "Checkers.error2():void", "qualifier": "object `str` last assigned on line 30 could be null and is dereferenced at line 31."}]
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/infer/test/autotest/src/main/java/Racerd.json firefox-trunk-71.0~a1~hg20190915r493291/tools/infer/test/autotest/src/main/java/Racerd.json
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/infer/test/autotest/src/main/java/Racerd.json	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/infer/test/autotest/src/main/java/Racerd.json	2019-09-15 11:33:31.000000000 +0000
@@ -1,146 +1 @@
-[
-    {
-        "access": "hJWmvgAAAJMAAAApAAAAfgAAAHSwkNAnZGVwb3NpdKCgQCNpbnRAk6AnQWNjb3VudECQoEAkdm9pZECgoJKgIECwXAD/kgkiYXV0b3Rlc3Qvc3JjL21haW4vamF2YS9SYWNlcmQuamF2YZGgoJGwAjafTBegJHRoaXNAkAQcoKOglJOgBBpAsEBAQEAEAaCRkTBBY2NvdW50Lm1CYWxhbmNlQKAEF0A=",
-        "bug_class": "PROVER",
-        "bug_trace": [
-            {
-                "column_number": -1,
-                "description": "access to `this.Account.mBalance`",
-                "filename": "autotest/src/main/java/Racerd.java",
-                "level": 0,
-                "line_number": 28
-            }
-        ],
-        "bug_type": "THREAD_SAFETY_VIOLATION",
-        "bug_type_hum": "Thread Safety Violation",
-        "censored_reason": "",
-        "column": -1,
-        "file": "autotest/src/main/java/Racerd.java",
-        "hash": "6b62cb17008a3135d218108fa3123402",
-        "key": "Racerd.java|deposit|THREAD_SAFETY_VIOLATION",
-        "kind": "ERROR",
-        "line": 28,
-        "node_key": "9c5d6d9028928346cc4fb44cced5dea1",
-        "procedure": "void Account.deposit(int)",
-        "procedure_id": "Account.deposit(int):void.a9cc1805c1e3652887a5ee12b55803af",
-        "procedure_start_line": 0,
-        "qualifier": "Unprotected write. Non-private method `void Account.deposit(int)` writes to field `this.Account.mBalance` outside of synchronization.\n Reporting because the current class is annotated `@ThreadSafe`, so we assume that this method can run in parallel with other non-private methods in the class (including itself).",
-        "severity": "HIGH",
-        "visibility": "user"
-    },
-    {
-        "access": "hJWmvgAAAKYAAAApAAAAhQAAAHqwkNAqbWFrZURpbm5lckCToCZSYWNlcmRAkKBAJHZvaWRAoKCQ0Clib2lsV2F0ZXJAk6AEC0AECkCwTQD/kgkiYXV0b3Rlc3Qvc3JjL21haW4vamF2YS9SYWNlcmQuamF2YZGgoJGwAjafTBegJHRoaXNAkAQboKOglJOgBBxAsEBAQEAEAaCRkTNSYWNlcmQubVRlbXBlcmF0dXJlQKCwUQD/BBdA",
-        "bug_class": "PROVER",
-        "bug_trace": [
-            {
-                "column_number": -1,
-                "description": "call to void Racerd.boilWater()",
-                "filename": "autotest/src/main/java/Racerd.java",
-                "level": 0,
-                "line_number": 13
-            },
-            {
-                "column_number": -1,
-                "description": "access to `this.Racerd.mTemperature`",
-                "filename": "autotest/src/main/java/Racerd.java",
-                "level": 1,
-                "line_number": 17
-            }
-        ],
-        "bug_type": "THREAD_SAFETY_VIOLATION",
-        "bug_type_hum": "Thread Safety Violation",
-        "censored_reason": "",
-        "column": -1,
-        "file": "autotest/src/main/java/Racerd.java",
-        "hash": "2882383086ab102a88144ae3c2cc4701",
-        "key": "Racerd.java|makeDinner|THREAD_SAFETY_VIOLATION",
-        "kind": "ERROR",
-        "line": 13,
-        "node_key": "9c5d6d9028928346cc4fb44cced5dea1",
-        "procedure": "void Racerd.makeDinner()",
-        "procedure_id": "Racerd.makeDinner():void.2796f75396b30d2d49b24ddfab722306",
-        "procedure_start_line": 0,
-        "qualifier": "Unprotected write. Non-private method `void Racerd.makeDinner()` indirectly writes to field `this.Racerd.mTemperature` outside of synchronization.\n Reporting because the current class is annotated `@ThreadSafe`, so we assume that this method can run in parallel with other non-private methods in the class (including itself).",
-        "severity": "HIGH",
-        "visibility": "user"
-    },
-    {
-        "access": "hJWmvgAAAJgAAAAqAAAAgwAAAHqwkNAod2l0aGRyYXegoEAjaW50QJOgJ0FjY291bnRAkKBABAZAoKCSoCBAsGMA/5IJImF1dG90ZXN0L3NyYy9tYWluL2phdmEvUmFjZXJkLmphdmGQoKCRsAI2n0wXoCR0aGlzQJAEG6CjoJSToAQZQLBAQEBABAGgkZEwQWNjb3VudC5tQmFsYW5jZUCgBBegsGIA/wQYQA==",
-        "bug_class": "PROVER",
-        "bug_trace": [
-            {
-                "column_number": -1,
-                "description": "<Read trace>",
-                "filename": "autotest/src/main/java/Racerd.java",
-                "level": 0,
-                "line_number": 35
-            },
-            {
-                "column_number": -1,
-                "description": "access to `this.Account.mBalance`",
-                "filename": "autotest/src/main/java/Racerd.java",
-                "level": 0,
-                "line_number": 35
-            },
-            {
-                "column_number": -1,
-                "description": "<Write trace>",
-                "filename": "autotest/src/main/java/Racerd.java",
-                "level": 0,
-                "line_number": 34
-            },
-            {
-                "column_number": -1,
-                "description": "access to `this.Account.mBalance`",
-                "filename": "autotest/src/main/java/Racerd.java",
-                "level": 0,
-                "line_number": 34
-            }
-        ],
-        "bug_type": "THREAD_SAFETY_VIOLATION",
-        "bug_type_hum": "Thread Safety Violation",
-        "censored_reason": "",
-        "column": -1,
-        "file": "autotest/src/main/java/Racerd.java",
-        "hash": "5665f12d2392f93f11f556cd1b1e238a",
-        "key": "Racerd.java|withdraw|THREAD_SAFETY_VIOLATION",
-        "kind": "ERROR",
-        "line": 35,
-        "node_key": "9c5d6d9028928346cc4fb44cced5dea1",
-        "procedure": "int Account.withdraw(int)",
-        "procedure_id": "Account.withdraw(int):int.038de5054c5c25e60d169e42e0177a16",
-        "procedure_start_line": 0,
-        "qualifier": "Read/Write race. Non-private method `int Account.withdraw(int)` reads without synchronization from `this.Account.mBalance`. Potentially races with write in method `Account.withdraw(...)`.\n Reporting because the current class is annotated `@ThreadSafe`, so we assume that this method can run in parallel with other non-private methods in the class (including itself).",
-        "severity": "HIGH",
-        "visibility": "user"
-    },
-    {
-        "access": "hJWmvgAAAJEAAAAoAAAAfAAAAHOwkNAod2l0aGRyYXegoEAjaW50QJOgJ0FjY291bnRAkKBABAZAoKCSoCBAsGIA/5IJImF1dG90ZXN0L3NyYy9tYWluL2phdmEvUmFjZXJkLmphdmGRoKCRsAI2n0wXoCR0aGlzQJAEG6CjoJSToAQZQLBAQEBABAGgkZEwQWNjb3VudC5tQmFsYW5jZUCgBBdA",
-        "bug_class": "PROVER",
-        "bug_trace": [
-            {
-                "column_number": -1,
-                "description": "access to `this.Account.mBalance`",
-                "filename": "autotest/src/main/java/Racerd.java",
-                "level": 0,
-                "line_number": 34
-            }
-        ],
-        "bug_type": "THREAD_SAFETY_VIOLATION",
-        "bug_type_hum": "Thread Safety Violation",
-        "censored_reason": "",
-        "column": -1,
-        "file": "autotest/src/main/java/Racerd.java",
-        "hash": "a7c30fd1b251d9e16750fc7e5913b885",
-        "key": "Racerd.java|withdraw|THREAD_SAFETY_VIOLATION",
-        "kind": "ERROR",
-        "line": 34,
-        "node_key": "9c5d6d9028928346cc4fb44cced5dea1",
-        "procedure": "int Account.withdraw(int)",
-        "procedure_id": "Account.withdraw(int):int.038de5054c5c25e60d169e42e0177a16",
-        "procedure_start_line": 0,
-        "qualifier": "Unprotected write. Non-private method `int Account.withdraw(int)` writes to field `this.Account.mBalance` outside of synchronization.\n Reporting because the current class is annotated `@ThreadSafe`, so we assume that this method can run in parallel with other non-private methods in the class (including itself).",
-        "severity": "HIGH",
-        "visibility": "user"
-    }
-]
+[{"key": "Racerd.java|deposit|THREAD_SAFETY_VIOLATION", "hash": "1ec753a9022eedd27443e3ed3da93e44", "severity": "WARNING", "column": -1, "bug_type_hum": "Thread Safety Violation", "access": "hJWmvgAAACsAAAAEAAAAEwAAAA+gsFwA/5IJImF1dG90ZXN0L3NyYy9tYWluL2phdmEvUmFjZXJkLmphdmFA", "bug_type": "THREAD_SAFETY_VIOLATION", "file": "autotest/src/main/java/Racerd.java", "procedure_start_line": 0, "line": 28, "bug_trace": [{"line_number": 28, "filename": "autotest/src/main/java/Racerd.java", "description": "access to `this.mBalance`", "column_number": -1, "level": 0}], "procedure": "Account.deposit(int):void", "qualifier": "Unprotected write. Non-private method `void Account.deposit(int)` writes to field `this.mBalance` outside of synchronization.\n Reporting because the current class is annotated `@ThreadSafe`, so we assume that this method can run in parallel with other non-private methods in the class (including itself)."}, {"key": "Racerd.java|makeDinner|THREAD_SAFETY_VIOLATION", "hash": "b4c48330cdd4742e24fdfc5c809ff604", "severity": "WARNING", "column": -1, "bug_type_hum": "Thread Safety Violation", "access": "hJWmvgAAACsAAAAEAAAAEwAAAA+gsFEA/5IJImF1dG90ZXN0L3NyYy9tYWluL2phdmEvUmFjZXJkLmphdmFA", "bug_type": "THREAD_SAFETY_VIOLATION", "file": "autotest/src/main/java/Racerd.java", "procedure_start_line": 0, "line": 13, "bug_trace": [{"line_number": 13, "filename": "autotest/src/main/java/Racerd.java", "description": "call to void Racerd.boilWater()", "column_number": -1, "level": 0}, {"line_number": 17, "filename": "autotest/src/main/java/Racerd.java", "description": "access to `this.mTemperature`", "column_number": -1, "level": 1}], "procedure": "Racerd.makeDinner():void", "qualifier": "Unprotected write. Non-private method `void Racerd.makeDinner()` indirectly writes to field `this.mTemperature` outside of synchronization.\n Reporting because the current class is annotated `@ThreadSafe`, so we assume that this method can run in parallel with other non-private methods in the class (including itself)."}, {"key": "Racerd.java|withdraw|THREAD_SAFETY_VIOLATION", "hash": "4cb9f0b0b4649ec0f84dea3541a6c70d", "severity": "WARNING", "column": -1, "bug_type_hum": "Thread Safety Violation", "access": "hJWmvgAAADIAAAAGAAAAGgAAABagsGEA/5IJImF1dG90ZXN0L3NyYy9tYWluL2phdmEvUmFjZXJkLmphdmGgsGIA/wQEQA==", "bug_type": "THREAD_SAFETY_VIOLATION", "file": "autotest/src/main/java/Racerd.java", "procedure_start_line": 0, "line": 33, "bug_trace": [{"line_number": 33, "filename": "autotest/src/main/java/Racerd.java", "description": "<Read trace>", "column_number": -1, "level": 0}, {"line_number": 33, "filename": "autotest/src/main/java/Racerd.java", "description": "access to `this.mBalance`", "column_number": -1, "level": 0}, {"line_number": 34, "filename": "autotest/src/main/java/Racerd.java", "description": "<Write trace>", "column_number": -1, "level": 0}, {"line_number": 34, "filename": "autotest/src/main/java/Racerd.java", "description": "access to `this.mBalance`", "column_number": -1, "level": 0}], "procedure": "Account.withdraw(int):int", "qualifier": "Read/Write race. Non-private method `int Account.withdraw(int)` reads without synchronization from `this.mBalance`. Potentially races with write in method `Account.withdraw(...)`.\n Reporting because the current class is annotated `@ThreadSafe`, so we assume that this method can run in parallel with other non-private methods in the class (including itself)."}, {"key": "Racerd.java|withdraw|THREAD_SAFETY_VIOLATION", "hash": "83037b7ad2aa337deba2dbe26e892440", "severity": "WARNING", "column": -1, "bug_type_hum": "Thread Safety Violation", "access": "hJWmvgAAACsAAAAEAAAAEwAAAA+gsGIA/5IJImF1dG90ZXN0L3NyYy9tYWluL2phdmEvUmFjZXJkLmphdmFA", "bug_type": "THREAD_SAFETY_VIOLATION", "file": "autotest/src/main/java/Racerd.java", "procedure_start_line": 0, "line": 34, "bug_trace": [{"line_number": 34, "filename": "autotest/src/main/java/Racerd.java", "description": "access to `this.mBalance`", "column_number": -1, "level": 0}], "procedure": "Account.withdraw(int):int", "qualifier": "Unprotected write. Non-private method `int Account.withdraw(int)` writes to field `this.mBalance` outside of synchronization.\n Reporting because the current class is annotated `@ThreadSafe`, so we assume that this method can run in parallel with other non-private methods in the class (including itself)."}]
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/infer/test/autotest/src/main/java/Starvation.json firefox-trunk-71.0~a1~hg20190915r493291/tools/infer/test/autotest/src/main/java/Starvation.json
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/infer/test/autotest/src/main/java/Starvation.json	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/infer/test/autotest/src/main/java/Starvation.json	2019-09-15 11:33:31.000000000 +0000
@@ -1,65 +1 @@
-[
-    {
-        "bug_class": "PROVER",
-        "bug_trace": [
-            {
-                "column_number": -1,
-                "description": "[Trace 1] `void Starvation.lockAThenB()`",
-                "filename": "autotest/src/main/java/Starvation.java",
-                "level": 0,
-                "line_number": 11
-            },
-            {
-                "column_number": -1,
-                "description": "locks `this.Starvation.lockA` in class `Starvation*`",
-                "filename": "autotest/src/main/java/Starvation.java",
-                "level": 0,
-                "line_number": 11
-            },
-            {
-                "column_number": -1,
-                "description": "locks `this.Starvation.lockB` in class `Starvation*`",
-                "filename": "autotest/src/main/java/Starvation.java",
-                "level": 1,
-                "line_number": 12
-            },
-            {
-                "column_number": -1,
-                "description": "[Trace 2] `void Starvation.lockBThenA()`",
-                "filename": "autotest/src/main/java/Starvation.java",
-                "level": 0,
-                "line_number": 19
-            },
-            {
-                "column_number": -1,
-                "description": "locks `this.Starvation.lockB` in class `Starvation*`",
-                "filename": "autotest/src/main/java/Starvation.java",
-                "level": 0,
-                "line_number": 19
-            },
-            {
-                "column_number": -1,
-                "description": "locks `this.Starvation.lockA` in class `Starvation*`",
-                "filename": "autotest/src/main/java/Starvation.java",
-                "level": 1,
-                "line_number": 20
-            }
-        ],
-        "bug_type": "DEADLOCK",
-        "bug_type_hum": "Deadlock",
-        "censored_reason": "",
-        "column": -1,
-        "file": "autotest/src/main/java/Starvation.java",
-        "hash": "043d28a94431b4c573b949b8570fb318",
-        "key": "Starvation.java|lockAThenB|DEADLOCK",
-        "kind": "ERROR",
-        "line": 11,
-        "node_key": "9c5d6d9028928346cc4fb44cced5dea1",
-        "procedure": "void Starvation.lockAThenB()",
-        "procedure_id": "Starvation.lockAThenB():void.b7eb3955306c498af42d6336f52a796f",
-        "procedure_start_line": 0,
-        "qualifier": "Potential deadlock.\nTrace 1 (starts at `void Starvation.lockAThenB()`) first locks `this.Starvation.lockA` in class `Starvation*` (line 11 in `void Starvation.lockAThenB()`) and then locks `this.Starvation.lockB` in class `Starvation*` (line 12 in `void Starvation.lockAThenB()`).\nTrace 2 (starts at `void Starvation.lockBThenA()`), first locks `this.Starvation.lockB` in class `Starvation*` (line 19 in `void Starvation.lockBThenA()`) and then locks `this.Starvation.lockA` in class `Starvation*` (line 20 in `void Starvation.lockBThenA()`).",
-        "severity": "HIGH",
-        "visibility": "user"
-    }
-]
+[{"key": "Starvation.java|lockAThenB|DEADLOCK", "hash": "9197aca80b5207ae80f4b51c218dcf49", "severity": "ERROR", "column": -1, "bug_type_hum": "Deadlock", "bug_type": "DEADLOCK", "file": "autotest/src/main/java/Starvation.java", "procedure_start_line": 0, "line": 11, "bug_trace": [{"line_number": 11, "filename": "autotest/src/main/java/Starvation.java", "description": "[Trace 1] `void Starvation.lockAThenB()`", "column_number": -1, "level": 0}, {"line_number": 11, "filename": "autotest/src/main/java/Starvation.java", "description": " locks `this.lockA` in `class Starvation`", "column_number": -1, "level": 0}, {"line_number": 12, "filename": "autotest/src/main/java/Starvation.java", "description": " locks `this.lockB` in `class Starvation`", "column_number": -1, "level": 1}, {"line_number": 19, "filename": "autotest/src/main/java/Starvation.java", "description": "[Trace 2] `void Starvation.lockBThenA()`", "column_number": -1, "level": 0}, {"line_number": 19, "filename": "autotest/src/main/java/Starvation.java", "description": " locks `this.lockB` in `class Starvation`", "column_number": -1, "level": 0}, {"line_number": 20, "filename": "autotest/src/main/java/Starvation.java", "description": " locks `this.lockA` in `class Starvation`", "column_number": -1, "level": 1}], "procedure": "Starvation.lockAThenB():void", "qualifier": "Potential deadlock. `void Starvation.lockAThenB()` (Trace 1) and `void Starvation.lockBThenA()` (Trace 2) acquire locks `this.lockB` in `class Starvation` and `this.lockA` in `class Starvation` in reverse orders."}]
\ No newline at end of file
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/lint/py2.yml firefox-trunk-71.0~a1~hg20190915r493291/tools/lint/py2.yml
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/lint/py2.yml	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/lint/py2.yml	2019-09-15 11:33:32.000000000 +0000
@@ -26,7 +26,6 @@
         - testing/tools
         - testing/web-platform
         - toolkit
-        - tools/profiler
         - tools/rb
         - tools/update-packaging
         - xpcom
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/lint/py3.yml firefox-trunk-71.0~a1~hg20190915r493291/tools/lint/py3.yml
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/lint/py3.yml	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/lint/py3.yml	2019-09-15 11:33:31.000000000 +0000
@@ -18,7 +18,6 @@
         - testing/tps
         - testing/web-platform
         - toolkit
-        - tools/profiler
         - tools/rb
         - xpcom/idl-parser
     extensions: ['py']
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/lint/spell/codespell_requirements.txt firefox-trunk-71.0~a1~hg20190915r493291/tools/lint/spell/codespell_requirements.txt
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/lint/spell/codespell_requirements.txt	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/lint/spell/codespell_requirements.txt	2019-09-15 11:33:32.000000000 +0000
@@ -1,2 +1,2 @@
-codespell==1.15.0 \
-    --hash=sha256:8f1bc15ca4322b72213b1cf13eb437b3c3956e0f423ab414d294d7e77e0e4130
+codespell==1.16.0 \
+    --hash=sha256:bf3b7c83327aefd26fe718527baa9bd61016e86db91a8123c0ef9c150fa02de9
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/profiler/core/platform.cpp firefox-trunk-71.0~a1~hg20190915r493291/tools/profiler/core/platform.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/profiler/core/platform.cpp	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/profiler/core/platform.cpp	2019-09-15 11:33:31.000000000 +0000
@@ -4053,7 +4053,8 @@
     nsIURI* aURI, int32_t aPriority, uint64_t aChannelId, NetworkLoadType aType,
     mozilla::TimeStamp aStart, mozilla::TimeStamp aEnd, int64_t aCount,
     mozilla::net::CacheDisposition aCacheDisposition,
-    const mozilla::net::TimingStruct* aTimings, nsIURI* aRedirectURI) {
+    const mozilla::net::TimingStruct* aTimings, nsIURI* aRedirectURI,
+    UniqueProfilerBacktrace aSource) {
   if (!profiler_is_active()) {
     return;
   }
@@ -4076,7 +4077,7 @@
       MakeUnique<NetworkMarkerPayload>(
           static_cast<int64_t>(aChannelId), PromiseFlatCString(spec).get(),
           aType, aStart, aEnd, aPriority, aCount, aCacheDisposition, aTimings,
-          PromiseFlatCString(redirect_spec).get()));
+          PromiseFlatCString(redirect_spec).get(), std::move(aSource)));
 }
 
 // This logic needs to add a marker for a different thread, so we actually need
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/profiler/public/GeckoProfiler.h firefox-trunk-71.0~a1~hg20190915r493291/tools/profiler/public/GeckoProfiler.h
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/profiler/public/GeckoProfiler.h	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/profiler/public/GeckoProfiler.h	2019-09-15 11:33:31.000000000 +0000
@@ -715,16 +715,16 @@
 enum class NetworkLoadType { LOAD_START, LOAD_STOP, LOAD_REDIRECT };
 
 #  define PROFILER_ADD_NETWORK_MARKER(uri, pri, channel, type, start, end,  \
-                                      count, cache, timings, redirect)      \
+                                      count, cache, timings, redirect, ...) \
     profiler_add_network_marker(uri, pri, channel, type, start, end, count, \
-                                cache, timings, redirect)
+                                cache, timings, redirect, ##__VA_ARGS__)
 
 void profiler_add_network_marker(
     nsIURI* aURI, int32_t aPriority, uint64_t aChannelId, NetworkLoadType aType,
     mozilla::TimeStamp aStart, mozilla::TimeStamp aEnd, int64_t aCount,
     mozilla::net::CacheDisposition aCacheDisposition,
     const mozilla::net::TimingStruct* aTimings = nullptr,
-    nsIURI* aRedirectURI = nullptr);
+    nsIURI* aRedirectURI = nullptr, UniqueProfilerBacktrace aSource = nullptr);
 
 enum TracingKind {
   TRACING_EVENT,
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/profiler/public/ProfilerMarkerPayload.h firefox-trunk-71.0~a1~hg20190915r493291/tools/profiler/public/ProfilerMarkerPayload.h
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/profiler/public/ProfilerMarkerPayload.h	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/profiler/public/ProfilerMarkerPayload.h	2019-09-15 11:33:31.000000000 +0000
@@ -251,8 +251,10 @@
                        int64_t aCount,
                        mozilla::net::CacheDisposition aCacheDisposition,
                        const mozilla::net::TimingStruct* aTimings = nullptr,
-                       const char* aRedirectURI = nullptr)
-      : ProfilerMarkerPayload(aStartTime, aEndTime, mozilla::Nothing()),
+                       const char* aRedirectURI = nullptr,
+                       UniqueProfilerBacktrace aSource = nullptr)
+      : ProfilerMarkerPayload(aStartTime, aEndTime, mozilla::Nothing(),
+                              mozilla::Nothing(), std::move(aSource)),
         mID(aID),
         mURI(aURI ? strdup(aURI) : nullptr),
         mRedirectURI(aRedirectURI && (strlen(aRedirectURI) > 0)
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/tools/rewriting/ThirdPartyPaths.txt firefox-trunk-71.0~a1~hg20190915r493291/tools/rewriting/ThirdPartyPaths.txt
--- firefox-trunk-71.0~a1~hg20190913r492975/tools/rewriting/ThirdPartyPaths.txt	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/tools/rewriting/ThirdPartyPaths.txt	2019-09-15 11:33:30.000000000 +0000
@@ -67,7 +67,6 @@
 js/src/vtune/legacy/
 js/src/zydis/
 media/ffvpx/
-media/gmp-clearkey/0.1/openaes/
 media/kiss_fft/
 media/libaom/
 media/libcubeb/
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/widget/cocoa/nsNativeThemeCocoa.mm firefox-trunk-71.0~a1~hg20190915r493291/widget/cocoa/nsNativeThemeCocoa.mm
--- firefox-trunk-71.0~a1~hg20190913r492975/widget/cocoa/nsNativeThemeCocoa.mm	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/widget/cocoa/nsNativeThemeCocoa.mm	2019-09-15 11:33:32.000000000 +0000
@@ -3436,8 +3436,8 @@
     mozilla::layers::RenderRootStateManager* aManager, nsIFrame* aFrame,
     StyleAppearance aAppearance, const nsRect& aRect) {
   nsPresContext* presContext = aFrame->PresContext();
-  wr::LayoutRect bounds = wr::ToRoundedLayoutRect(
-      LayoutDeviceRect::FromAppUnits(aRect, presContext->AppUnitsPerDevPixel()));
+  wr::LayoutRect bounds =
+      wr::ToLayoutRect(LayoutDeviceRect::FromAppUnits(aRect, presContext->AppUnitsPerDevPixel()));
 
   EventStates eventState = GetContentState(aFrame, aAppearance);
 
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/widget/gtk/nsNativeThemeGTK.cpp firefox-trunk-71.0~a1~hg20190915r493291/widget/gtk/nsNativeThemeGTK.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/widget/gtk/nsNativeThemeGTK.cpp	2019-09-13 05:13:36.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/widget/gtk/nsNativeThemeGTK.cpp	2019-09-15 11:33:31.000000000 +0000
@@ -1243,9 +1243,8 @@
     mozilla::layers::RenderRootStateManager* aManager, nsIFrame* aFrame,
     StyleAppearance aAppearance, const nsRect& aRect) {
   nsPresContext* presContext = aFrame->PresContext();
-  wr::LayoutRect bounds =
-      wr::ToRoundedLayoutRect(LayoutDeviceRect::FromAppUnits(
-          aRect, presContext->AppUnitsPerDevPixel()));
+  wr::LayoutRect bounds = wr::ToLayoutRect(LayoutDeviceRect::FromAppUnits(
+      aRect, presContext->AppUnitsPerDevPixel()));
 
   switch (aAppearance) {
     case StyleAppearance::Window:
diff -Nru firefox-trunk-71.0~a1~hg20190913r492975/xpcom/io/nsDirectoryService.cpp firefox-trunk-71.0~a1~hg20190915r493291/xpcom/io/nsDirectoryService.cpp
--- firefox-trunk-71.0~a1~hg20190913r492975/xpcom/io/nsDirectoryService.cpp	2019-09-13 05:13:35.000000000 +0000
+++ firefox-trunk-71.0~a1~hg20190915r493291/xpcom/io/nsDirectoryService.cpp	2019-09-15 11:33:31.000000000 +0000
@@ -183,6 +183,8 @@
     return NS_ERROR_INVALID_ARG;
   }
 
+  MOZ_ASSERT(NS_IsMainThread(), "Do not call dirsvc::get on non-main threads!");
+
   nsDependentCString key(aProp);
 
   nsCOMPtr<nsIFile> cachedFile = mHashtable.Get(key);